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

Reintroduce Box for style_sheet in Scrollable

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2021-10-31 17:39:24 +07:00
parent 48490c3d87
commit eed19dcf81
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
6 changed files with 29 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -95,7 +95,7 @@ impl Sandbox for ScrollableDemo {
.on_scroll(move |offset| {
Message::Scrolled(i, offset)
})
.style(theme.clone().into())
.style(*theme)
.push(Text::new(variant.title))
.push(
Button::new(

4
examples/scrollable/src/style.rs
View file

@ -34,11 +34,11 @@ impl<'a> From<Theme> for Box<dyn radio::StyleSheet + 'a> {
}
}
impl From<Theme> for &'static dyn scrollable::StyleSheet {
impl<'a> From<Theme> for Box<dyn scrollable::StyleSheet + 'a> {
fn from(theme: Theme) -> Self {
match theme {
Theme::Light => Default::default(),
Theme::Dark => &dark::Scrollable,
Theme::Dark => dark::Scrollable.into(),
}
}
}

6
examples/styling/src/main.rs
View file

@ -98,7 +98,7 @@ impl Sandbox for Styling {
let scrollable = Scrollable::new(&mut self.scroll)
.width(Length::Fill)
.height(Length::Units(100))
.style(self.theme.into())
.style(self.theme)
.push(Text::new("Scroll me!"))
.push(Space::with_height(Length::Units(800)))
.push(Text::new("You did it!"));
@ -212,11 +212,11 @@ mod style {
}
}
impl From<Theme> for &'static dyn scrollable::StyleSheet {
impl<'a> From<Theme> for Box<dyn scrollable::StyleSheet + 'a> {
fn from(theme: Theme) -> Self {
match theme {
Theme::Light => Default::default(),
Theme::Dark => &dark::Scrollable,
Theme::Dark => dark::Scrollable.into(),
}
}
}