me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2303 from GyulyVGC/master

Browse source 
[Minor Fix] Scrollbar style when cursor is over scrollable area
This commit is contained in:
Héctor Ramón 2024-02-28 10:34:39 +01:00 • committed by GitHub
commit af9fb367f3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

32
widget/src/scrollable.rs
View file

@ -907,7 +907,15 @@ pub fn draw<Theme, Renderer>(
theme.active(style) theme.active(style)
}; };
let idle_scrollbar = theme.active(style).scrollbar; let scrollbar_style = |is_dragging: bool, mouse_over_scrollbar: bool| {
if is_dragging {
theme.dragging(style).scrollbar
} else if cursor_over_scrollable.is_some() {
theme.hovered(style, mouse_over_scrollbar).scrollbar
} else {
theme.active(style).scrollbar
}
};
container::draw_background( container::draw_background(
renderer, renderer,
@ -984,13 +992,10 @@ pub fn draw<Theme, Renderer>(
if let Some(scrollbar) = scrollbars.y { if let Some(scrollbar) = scrollbars.y {
draw_scrollbar( draw_scrollbar(
renderer, renderer,
if mouse_over_y_scrollbar scrollbar_style(
|| state.y_scroller_grabbed_at.is_some() state.y_scroller_grabbed_at.is_some(),
{ mouse_over_y_scrollbar,
appearance.scrollbar ),
} else {
idle_scrollbar
},
&scrollbar, &scrollbar,
); );
} }
@ -998,13 +1003,10 @@ pub fn draw<Theme, Renderer>(
if let Some(scrollbar) = scrollbars.x { if let Some(scrollbar) = scrollbars.x {
draw_scrollbar( draw_scrollbar(
renderer, renderer,
if mouse_over_x_scrollbar scrollbar_style(
|| state.x_scroller_grabbed_at.is_some() state.x_scroller_grabbed_at.is_some(),
{ mouse_over_x_scrollbar,
appearance.scrollbar ),
} else {
idle_scrollbar
},
&scrollbar, &scrollbar,
); );
} }