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

Dim if no space reserved and fix some issues

Browse source
This commit is contained in:
MrSubidubi 2025-08-18 17:23:31 +02:00
parent 8b458b2a7a
commit fd8fb1ed16
1 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -218,12 +218,14 @@ where
let state = &scrollbar.read(cx).0; let state = &scrollbar.read(cx).0;
div.when_some(state.read(cx).handle_to_track(), |this, handle| { div.when_some(state.read(cx).handle_to_track(), |this, handle| {
this.track_scroll(handle) this.track_scroll(handle).when_some(
}) state.read(cx).visible_axes(),
.when_some(state.read(cx).visible_axes(), |this, axes| match axes { |this, axes| match axes {
ScrollAxes::Horizontal => this.overflow_x_scroll(), ScrollAxes::Horizontal => this.overflow_x_scroll(),
ScrollAxes::Vertical => this.overflow_y_scroll(), ScrollAxes::Vertical => this.overflow_y_scroll(),
ScrollAxes::Both => this.overflow_scroll(), ScrollAxes::Both => this.overflow_scroll(),
},
)
}) })
.when_some( .when_some(
state state
@ -602,6 +604,7 @@ impl<S: ScrollbarVisibilitySetting, T: ScrollableHandle> ScrollbarState<S, T> {
if self.scroll_handle.offset() != offset { if self.scroll_handle.offset() != offset {
self.scroll_handle.set_offset(offset); self.scroll_handle.set_offset(offset);
self.notify_parent(cx); self.notify_parent(cx);
cx.notify();
} }
// We always want to show scrollbars in cases where the offset is updated. // We always want to show scrollbars in cases where the offset is updated.
@ -1029,9 +1032,11 @@ impl<S: ScrollbarVisibilitySetting, T: ScrollableHandle> Element for ScrollbarEl
thumb_bounds, thumb_bounds,
cursor_hitbox, cursor_hitbox,
axis, axis,
reserved_space,
.. ..
} in &prepaint_state.thumbs } in &prepaint_state.thumbs
{ {
const MAXIMUM_OPACITY: f32 = 0.5;
let thumb_state = self.state.read(cx).thumb_state; let thumb_state = self.state.read(cx).thumb_state;
let thumb_base_color = match thumb_state { let thumb_base_color = match thumb_state {
ThumbState::Dragging(dragged_axis, _) if dragged_axis == *axis => { ThumbState::Dragging(dragged_axis, _) if dragged_axis == *axis => {
@ -1043,7 +1048,16 @@ impl<S: ScrollbarVisibilitySetting, T: ScrollableHandle> Element for ScrollbarEl
_ => colors.scrollbar_thumb_background, _ => colors.scrollbar_thumb_background,
}; };
let thumb_background = colors.surface_background.blend(thumb_base_color); let blending_color = if matches!(thumb_state, ThumbState::Hover(_))
|| reserved_space.needs_scroll_track()
{
colors.surface_background
} else {
let blend_color = colors.surface_background;
blend_color.min(blend_color.alpha(MAXIMUM_OPACITY))
};
let thumb_background = blending_color.blend(thumb_base_color);
window.paint_quad(quad( window.paint_quad(quad(
*thumb_bounds, *thumb_bounds,