oak-team/oak-gpui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ui: Don't show scrollbar track in too many cases (#41455)

Browse Source 
Follow-up to https://github.com/zed-industries/zed/pull/41354 which
introduced a small regression.

Release Notes:

- N/A
This commit is contained in:
Finn Evers
2025-10-29 12:20:57 +00:00
committed by GitHub
parent bde7e55adb
commit d59ecf790f
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ui/src/components/scrollbar.rs
+10 -2
View File
@@ -1171,12 +1171,14 @@ impl<T: ScrollableHandle> Element for ScrollbarElement<T> {
.apply_along(axis, |_| thumb_end - thumb_offset),
);
let needs_scroll_track = reserved_space.needs_scroll_track();
ScrollbarLayout {
thumb_bounds,
track_bounds: padded_bounds,
axis,
cursor_hitbox: window.insert_hitbox(
if reserved_space.needs_scroll_track() {
if needs_scroll_track {
padded_bounds
} else {
thumb_bounds
@@ -1184,6 +1186,7 @@ impl<T: ScrollableHandle> Element for ScrollbarElement<T> {
HitboxBehavior::BlockMouseExceptScroll,
),
track_background: track_color
.filter(|_| needs_scroll_track)
.map(|color| (padded_bounds.dilate(SCROLLBAR_PADDING), color)),
reserved_space,
}
@@ -1292,10 +1295,15 @@ impl<T: ScrollableHandle> Element for ScrollbarElement<T> {
}
if let Some((track_bounds, color)) = track_background {
let mut color = *color;
if let Some(fade) = autohide_fade {
color.fade_out(fade);
}
window.paint_quad(quad(
*track_bounds,
Corners::default(),
*color,
color,
Edges::default(),
Hsla::transparent_black(),
BorderStyle::default(),