Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

linux: Fix crash when switching repository via git panel (#31556)

Browse source 
Closes #30409

Handles edge case where `f32` turns into `Nan` and causes panic down the
code.

Release Notes:

- Fixed issue where Zed crashes on switching repository via git panel on
Linux.
This commit is contained in:
Smit Barmase 2025-05-28 05:26:00 +05:30 • committed by GitHub
parent 506beafe10
commit 6545c5ebe0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/ui/src/components/scrollbar.rs
View file

@ -145,10 +145,14 @@ impl ScrollbarState {
const MINIMUM_THUMB_SIZE: Pixels = px(25.); const MINIMUM_THUMB_SIZE: Pixels = px(25.);
let content_size = self.scroll_handle.content_size().along(axis); let content_size = self.scroll_handle.content_size().along(axis);
let viewport_size = self.scroll_handle.viewport().size.along(axis); let viewport_size = self.scroll_handle.viewport().size.along(axis);
if content_size.is_zero() || viewport_size.is_zero() || content_size < viewport_size { if content_size.is_zero() || viewport_size.is_zero() || content_size <= viewport_size {
return None;
}
let visible_percentage = viewport_size / content_size;
let thumb_size = MINIMUM_THUMB_SIZE.max(viewport_size * visible_percentage);
if thumb_size > viewport_size {
return None; return None;
} }
let max_offset = content_size - viewport_size; let max_offset = content_size - viewport_size;
let current_offset = self let current_offset = self
.scroll_handle .scroll_handle
@ -156,12 +160,6 @@ impl ScrollbarState {
.along(axis) .along(axis)
.clamp(-max_offset, Pixels::ZERO) .clamp(-max_offset, Pixels::ZERO)
.abs(); .abs();
let visible_percentage = viewport_size / content_size;
let thumb_size = MINIMUM_THUMB_SIZE.max(viewport_size * visible_percentage);
if thumb_size > viewport_size {
return None;
}
let start_offset = (current_offset / max_offset) * (viewport_size - thumb_size); let start_offset = (current_offset / max_offset) * (viewport_size - thumb_size);
let thumb_percentage_start = start_offset / viewport_size; let thumb_percentage_start = start_offset / viewport_size;
let thumb_percentage_end = (start_offset + thumb_size) / viewport_size; let thumb_percentage_end = (start_offset + thumb_size) / viewport_size;