diff options
author | 2024-02-12 19:24:09 +0100 | |
---|---|---|
committer | 2024-02-12 19:24:09 +0100 | |
commit | 0eaaeaa517a00765045de155bb1de01c2d8f553f (patch) | |
tree | bf6d2d909bb9d2b1c9aae623775573d6e7df8c8c /examples/scrollable | |
parent | 0f920e0435932c0b6927c771424b2ba495ddb46e (diff) | |
download | iced-0eaaeaa517a00765045de155bb1de01c2d8f553f.tar.gz iced-0eaaeaa517a00765045de155bb1de01c2d8f553f.tar.bz2 iced-0eaaeaa517a00765045de155bb1de01c2d8f553f.zip |
Simplify `scrollable` styling API
Diffstat (limited to 'examples/scrollable')
-rw-r--r-- | examples/scrollable/src/main.rs | 53 |
1 files changed, 2 insertions, 51 deletions
diff --git a/examples/scrollable/src/main.rs b/examples/scrollable/src/main.rs index 5f5cfdc6..29c39c36 100644 --- a/examples/scrollable/src/main.rs +++ b/examples/scrollable/src/main.rs @@ -1,13 +1,11 @@ use iced::executor; -use iced::theme; -use iced::widget::scrollable::{Appearance, Properties, Scrollbar, Scroller}; +use iced::widget::scrollable::Properties; use iced::widget::{ button, column, container, horizontal_space, progress_bar, radio, row, scrollable, slider, text, vertical_space, }; use iced::{ - Alignment, Application, Border, Color, Command, Element, Length, Settings, - Theme, + Alignment, Application, Color, Command, Element, Length, Settings, Theme, }; use once_cell::sync::Lazy; @@ -263,7 +261,6 @@ impl Application for ScrollableDemo { .scroller_width(self.scroller_width) .alignment(self.alignment), )) - .style(theme::Scrollable::custom(ScrollbarCustomStyle)) .id(SCROLLABLE_ID.clone()) .on_scroll(Message::Scrolled), Direction::Multi => scrollable( @@ -311,9 +308,6 @@ impl Application for ScrollableDemo { vertical: properties, } }) - .style(theme::Scrollable::Custom(Box::new( - ScrollbarCustomStyle, - ))) .id(SCROLLABLE_ID.clone()) .on_scroll(Message::Scrolled), }); @@ -350,49 +344,6 @@ impl Application for ScrollableDemo { } } -struct ScrollbarCustomStyle; - -impl scrollable::StyleSheet for ScrollbarCustomStyle { - type Style = Theme; - - fn appearance(&self, style: &Self::Style) -> Appearance { - style.appearance(&theme::Scrollable::Default) - } - - fn active(&self, style: &Self::Style) -> Scrollbar { - style.active(&theme::Scrollable::Default) - } - - fn hovered( - &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, - is_mouse_over_scrollbar: bool, - ) -> Scrollbar { - if is_mouse_over_scrollbar { - Scrollbar { - background: style - .active(&theme::Scrollable::default()) - .background, - border: Border::with_radius(2), - scroller: Scroller { - color: Color::from_rgb8(250, 85, 134), - border: Border::with_radius(2), - }, - } - } else { - self.active(style) - } - } -} - fn progress_bar_custom_style(theme: &Theme) -> progress_bar::Appearance { progress_bar::Appearance { background: theme.extended_palette().background.strong.color.into(), |