dan/gpui-component
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scrollbar: Improve thumb bounds for avoid trigger scrollbar. (#496)

Browse source
This commit is contained in:
Jason Lee 2024-12-18 17:21:57 +08:00 committed by GitHub
parent 4f7ca4bb9a
commit 24982fb78c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
crates/ui/src/scroll/scrollbar.rs
View file

@ -22,6 +22,7 @@ impl ScrollbarShow {
} }
} }
const BORDER_WIDTH: Pixels = px(0.);
const MIN_THUMB_SIZE: f32 = 80.; const MIN_THUMB_SIZE: f32 = 80.;
const THUMB_RADIUS: Pixels = Pixels(3.0); const THUMB_RADIUS: Pixels = Pixels(3.0);
const THUMB_INSET: Pixels = Pixels(4.); const THUMB_INSET: Pixels = Pixels(4.);
@ -357,11 +358,12 @@ pub struct AxisPrepaintState {
axis: ScrollbarAxis, axis: ScrollbarAxis,
bar_hitbox: Hitbox, bar_hitbox: Hitbox,
bounds: Bounds<Pixels>, bounds: Bounds<Pixels>,
border_width: Pixels,
radius: Pixels, radius: Pixels,
bg: Hsla, bg: Hsla,
border: Hsla, border: Hsla,
thumb_bounds: Bounds<Pixels>, thumb_bounds: Bounds<Pixels>,
// Bounds of thumb to be rendered.
thumb_fill_bounds: Bounds<Pixels>,
thumb_bg: Hsla, thumb_bg: Hsla,
scroll_size: Pixels, scroll_size: Pixels,
container_size: Pixels, container_size: Pixels,
@ -513,11 +515,21 @@ impl Element for Scrollbar {
idle_state idle_state
}; };
let border_width = px(0.);
let thumb_bounds = if is_vertical { let thumb_bounds = if is_vertical {
Bounds::from_corners(
point(bounds.origin.x, bounds.origin.y + thumb_start),
point(bounds.origin.x + self.width, bounds.origin.y + thumb_end),
)
} else {
Bounds::from_corners(
point(bounds.origin.x + thumb_start, bounds.origin.y),
point(bounds.origin.x + thumb_end, bounds.origin.y + self.width),
)
};
let thumb_fill_bounds = if is_vertical {
Bounds::from_corners( Bounds::from_corners(
point( point(
bounds.origin.x + inset + border_width, bounds.origin.x + inset + BORDER_WIDTH,
bounds.origin.y + thumb_start + inset, bounds.origin.y + thumb_start + inset,
), ),
point( point(
@ -529,7 +541,7 @@ impl Element for Scrollbar {
Bounds::from_corners( Bounds::from_corners(
point( point(
bounds.origin.x + thumb_start + inset, bounds.origin.x + thumb_start + inset,
bounds.origin.y + inset + border_width, bounds.origin.y + inset + BORDER_WIDTH,
), ),
point( point(
bounds.origin.x + thumb_end - inset, bounds.origin.x + thumb_end - inset,
@ -546,11 +558,11 @@ impl Element for Scrollbar {
axis, axis,
bar_hitbox, bar_hitbox,
bounds, bounds,
border_width,
radius, radius,
bg: bar_bg, bg: bar_bg,
border: bar_border, border: bar_border,
thumb_bounds, thumb_bounds,
thumb_fill_bounds,
thumb_bg, thumb_bg,
scroll_size: scroll_area_size, scroll_size: scroll_area_size,
container_size, container_size,
@ -599,11 +611,11 @@ impl Element for Scrollbar {
top: px(0.), top: px(0.),
right: px(0.), right: px(0.),
bottom: px(0.), bottom: px(0.),
left: state.border_width, left: BORDER_WIDTH,
} }
} else { } else {
Edges { Edges {
top: state.border_width, top: BORDER_WIDTH,
right: px(0.), right: px(0.),
bottom: px(0.), bottom: px(0.),
left: px(0.), left: px(0.),
@ -612,7 +624,7 @@ impl Element for Scrollbar {
border_color: state.border, border_color: state.border,
}); });
cx.paint_quad(fill(thumb_bounds, state.thumb_bg).corner_radii(radius)); cx.paint_quad(fill(state.thumb_fill_bounds, state.thumb_bg).corner_radii(radius));
}); });
cx.on_mouse_event({ cx.on_mouse_event({