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

Merge pull request #1669 from GyulyVGC/master

Browse source 
Added scrollable style `focused` to be displayed when mouse is over the scrollable area
This commit is contained in:
Héctor Ramón 2023-03-27 16:17:02 +02:00 • committed by GitHub
commit 4e409bb383
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 76 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

36
examples/scrollable/src/main.rs
View file

@ -338,22 +338,36 @@ impl scrollable::StyleSheet for ScrollbarCustomStyle {
style.active(&theme::Scrollable::Default) style.active(&theme::Scrollable::Default)
} }
fn hovered(&self, style: &Self::Style) -> Scrollbar { fn hovered(
style.hovered(&theme::Scrollable::Default) &self,
style: &Self::Style,
is_mouse_over_scrollbar: bool,
) -> Scrollbar {
style.hovered(&theme::Scrollable::Default, is_mouse_over_scrollbar)
} }
fn hovered_horizontal(&self, style: &Self::Style) -> Scrollbar { fn hovered_horizontal(
Scrollbar { &self,
background: style.active(&theme::Scrollable::default()).background, style: &Self::Style,
border_radius: 0.0, is_mouse_over_scrollbar: bool,
border_width: 0.0, ) -> Scrollbar {
border_color: Default::default(), if is_mouse_over_scrollbar {
scroller: Scroller { Scrollbar {
color: Color::from_rgb8(250, 85, 134), background: style
.active(&theme::Scrollable::default())
.background,
border_radius: 0.0, border_radius: 0.0,
border_width: 0.0, border_width: 0.0,
border_color: Default::default(), border_color: Default::default(),
}, scroller: Scroller {
color: Color::from_rgb8(250, 85, 134),
border_radius: 0.0,
border_width: 0.0,
border_color: Default::default(),
},
}
} else {
self.active(style)
} }
} }
} }

8
native/src/widget/scrollable.rs
View file

@ -857,8 +857,8 @@ pub fn draw<Renderer>(
if let Some(scrollbar) = scrollbars.y { if let Some(scrollbar) = scrollbars.y {
let style = if state.y_scroller_grabbed_at.is_some() { let style = if state.y_scroller_grabbed_at.is_some() {
theme.dragging(style) theme.dragging(style)
} else if mouse_over_y_scrollbar { } else if mouse_over_scrollable {
theme.hovered(style) theme.hovered(style, mouse_over_y_scrollbar)
} else { } else {
theme.active(style) theme.active(style)
}; };
@ -870,8 +870,8 @@ pub fn draw<Renderer>(
if let Some(scrollbar) = scrollbars.x { if let Some(scrollbar) = scrollbars.x {
let style = if state.x_scroller_grabbed_at.is_some() { let style = if state.x_scroller_grabbed_at.is_some() {
theme.dragging_horizontal(style) theme.dragging_horizontal(style)
} else if mouse_over_x_scrollbar { } else if mouse_over_scrollable {
theme.hovered_horizontal(style) theme.hovered_horizontal(style, mouse_over_x_scrollbar)
} else { } else {
theme.active_horizontal(style) theme.active_horizontal(style)
}; };

22
style/src/scrollable.rs
View file

@ -37,12 +37,16 @@ pub trait StyleSheet {
/// Produces the style of an active scrollbar. /// Produces the style of an active scrollbar.
fn active(&self, style: &Self::Style) -> Scrollbar; fn active(&self, style: &Self::Style) -> Scrollbar;
/// Produces the style of a hovered scrollbar. /// Produces the style of a scrollbar when the scrollable is being hovered.
fn hovered(&self, style: &Self::Style) -> Scrollbar; fn hovered(
&self,
style: &Self::Style,
is_mouse_over_scrollbar: bool,
) -> Scrollbar;
/// Produces the style of a scrollbar that is being dragged. /// Produces the style of a scrollbar that is being dragged.
fn dragging(&self, style: &Self::Style) -> Scrollbar { fn dragging(&self, style: &Self::Style) -> Scrollbar {
self.hovered(style) self.hovered(style, true)
} }
/// Produces the style of an active horizontal scrollbar. /// Produces the style of an active horizontal scrollbar.
@ -50,13 +54,17 @@ pub trait StyleSheet {
self.active(style) self.active(style)
} }
/// Produces the style of a hovered horizontal scrollbar. /// Produces the style of a horizontal scrollbar when the scrollable is being hovered.
fn hovered_horizontal(&self, style: &Self::Style) -> Scrollbar { fn hovered_horizontal(
self.hovered(style) &self,
style: &Self::Style,
is_mouse_over_scrollbar: bool,
) -> Scrollbar {
self.hovered(style, is_mouse_over_scrollbar)
} }
/// Produces the style of a horizontal scrollbar that is being dragged. /// Produces the style of a horizontal scrollbar that is being dragged.
fn dragging_horizontal(&self, style: &Self::Style) -> Scrollbar { fn dragging_horizontal(&self, style: &Self::Style) -> Scrollbar {
self.hovered_horizontal(style) self.hovered_horizontal(style, true)
} }
} }

48
style/src/theme.rs
View file

@ -906,31 +906,41 @@ impl scrollable::StyleSheet for Theme {
} }
} }
fn hovered(&self, style: &Self::Style) -> scrollable::Scrollbar { fn hovered(
&self,
style: &Self::Style,
is_mouse_over_scrollbar: bool,
) -> scrollable::Scrollbar {
match style { match style {
Scrollable::Default => { Scrollable::Default => {
let palette = self.extended_palette(); if is_mouse_over_scrollbar {
let palette = self.extended_palette();
scrollable::Scrollbar { scrollable::Scrollbar {
background: palette.background.weak.color.into(), background: palette.background.weak.color.into(),
border_radius: 2.0,
border_width: 0.0,
border_color: Color::TRANSPARENT,
scroller: scrollable::Scroller {
color: palette.primary.strong.color,
border_radius: 2.0, border_radius: 2.0,
border_width: 0.0, border_width: 0.0,
border_color: Color::TRANSPARENT, border_color: Color::TRANSPARENT,
}, scroller: scrollable::Scroller {
color: palette.primary.strong.color,
border_radius: 2.0,
border_width: 0.0,
border_color: Color::TRANSPARENT,
},
}
} else {
self.active(style)
} }
} }
Scrollable::Custom(custom) => custom.hovered(self), Scrollable::Custom(custom) => {
custom.hovered(self, is_mouse_over_scrollbar)
}
} }
} }
fn dragging(&self, style: &Self::Style) -> scrollable::Scrollbar { fn dragging(&self, style: &Self::Style) -> scrollable::Scrollbar {
match style { match style {
Scrollable::Default => self.hovered(style), Scrollable::Default => self.hovered(style, true),
Scrollable::Custom(custom) => custom.dragging(self), Scrollable::Custom(custom) => custom.dragging(self),
} }
} }
@ -942,10 +952,16 @@ impl scrollable::StyleSheet for Theme {
} }
} }
fn hovered_horizontal(&self, style: &Self::Style) -> scrollable::Scrollbar { fn hovered_horizontal(
&self,
style: &Self::Style,
is_mouse_over_scrollbar: bool,
) -> scrollable::Scrollbar {
match style { match style {
Scrollable::Default => self.hovered(style), Scrollable::Default => self.hovered(style, is_mouse_over_scrollbar),
Scrollable::Custom(custom) => custom.hovered_horizontal(self), Scrollable::Custom(custom) => {
custom.hovered_horizontal(self, is_mouse_over_scrollbar)
}
} }
} }
@ -954,7 +970,7 @@ impl scrollable::StyleSheet for Theme {
style: &Self::Style, style: &Self::Style,
) -> scrollable::Scrollbar { ) -> scrollable::Scrollbar {
match style { match style {
Scrollable::Default => self.hovered_horizontal(style), Scrollable::Default => self.hovered_horizontal(style, true),
Scrollable::Custom(custom) => custom.dragging_horizontal(self), Scrollable::Custom(custom) => custom.dragging_horizontal(self),
} }
} }