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

Reintroduce Box for style_sheet in Button

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2021-10-31 16:53:18 +07:00
parent 661cb5736e
commit d36ce33a95
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
10 changed files with 42 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -834,12 +834,12 @@ impl Controls {
Text::new(if is_playing { "Pause" } else { "Play" }), Text::new(if is_playing { "Pause" } else { "Play" }),
) )
.on_press(Message::TogglePlayback) .on_press(Message::TogglePlayback)
.style(&style::Button), .style(style::Button),
) )
.push( .push(
Button::new(&mut self.next_button, Text::new("Next")) Button::new(&mut self.next_button, Text::new("Next"))
.on_press(Message::Next) .on_press(Message::Next)
.style(&style::Button), .style(style::Button),
); );
let speed_controls = Row::new() let speed_controls = Row::new()
@ -883,7 +883,7 @@ impl Controls {
.push( .push(
Button::new(&mut self.clear_button, Text::new("Clear")) Button::new(&mut self.clear_button, Text::new("Clear"))
.on_press(Message::Clear) .on_press(Message::Clear)
.style(&style::Clear), .style(style::Clear),
) )
.into() .into()
} }

10
examples/pane_grid/src/main.rs
View file

@ -158,7 +158,7 @@ impl Application for Example {
let pin_button = let pin_button =
Button::new(&mut pane.pin_button, Text::new(text).size(14)) Button::new(&mut pane.pin_button, Text::new(text).size(14))
.on_press(Message::TogglePin(id)) .on_press(Message::TogglePin(id))
.style(&style::Button::Pin) .style(style::Button::Pin)
.padding(3); .padding(3);
let title = Row::with_children(vec![ let title = Row::with_children(vec![
@ -316,13 +316,13 @@ impl Content {
split_horizontally, split_horizontally,
"Split horizontally", "Split horizontally",
Message::Split(pane_grid::Axis::Horizontal, pane), Message::Split(pane_grid::Axis::Horizontal, pane),
&style::Button::Primary, style::Button::Primary,
)) ))
.push(button( .push(button(
split_vertically, split_vertically,
"Split vertically", "Split vertically",
Message::Split(pane_grid::Axis::Vertical, pane), Message::Split(pane_grid::Axis::Vertical, pane),
&style::Button::Primary, style::Button::Primary,
)); ));
if total_panes > 1 && !is_pinned { if total_panes > 1 && !is_pinned {
@ -330,7 +330,7 @@ impl Content {
close, close,
"Close", "Close",
Message::Close(pane), Message::Close(pane),
&style::Button::Destructive, style::Button::Destructive,
)); ));
} }
@ -364,7 +364,7 @@ impl Controls {
) -> Element<Message> { ) -> Element<Message> {
let mut button = let mut button =
Button::new(&mut self.close, Text::new("Close").size(14)) Button::new(&mut self.close, Text::new("Close").size(14))
.style(&style::Button::Control) .style(style::Button::Control)
.padding(3); .padding(3);
if total_panes > 1 && !is_pinned { if total_panes > 1 && !is_pinned {
button = button.on_press(Message::Close(pane)); button = button.on_press(Message::Close(pane));

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

@ -243,7 +243,7 @@ impl From<reqwest::Error> for Error {
fn button<'a>(state: &'a mut button::State, text: &str) -> Button<'a, Message> { fn button<'a>(state: &'a mut button::State, text: &str) -> Button<'a, Message> {
Button::new(state, Text::new(text)) Button::new(state, Text::new(text))
.padding(10) .padding(10)
.style(&style::Button::Primary) .style(style::Button::Primary)
} }
mod style { mod style {

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

@ -112,15 +112,15 @@ impl Application for Stopwatch {
let toggle_button = { let toggle_button = {
let (label, color) = match self.state { let (label, color) = match self.state {
State::Idle => ("Start", &style::Button::Primary), State::Idle => ("Start", style::Button::Primary),
State::Ticking { .. } => ("Stop", &style::Button::Destructive), State::Ticking { .. } => ("Stop", style::Button::Destructive),
}; };
button(&mut self.toggle, label, color).on_press(Message::Toggle) button(&mut self.toggle, label, color).on_press(Message::Toggle)
}; };
let reset_button = let reset_button =
button(&mut self.reset, "Reset", &style::Button::Secondary) button(&mut self.reset, "Reset", style::Button::Secondary)
.on_press(Message::Reset); .on_press(Message::Reset);
let controls = Row::new() let controls = Row::new()

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

@ -82,7 +82,7 @@ impl Sandbox for Styling {
let button = Button::new(&mut self.button, Text::new("Submit")) let button = Button::new(&mut self.button, Text::new("Submit"))
.padding(10) .padding(10)
.on_press(Message::ButtonPressed) .on_press(Message::ButtonPressed)
.style(self.theme.into()); .style(self.theme);
let slider = Slider::new( let slider = Slider::new(
&mut self.slider, &mut self.slider,
@ -203,11 +203,11 @@ mod style {
} }
} }
impl From<Theme> for &'static dyn button::StyleSheet { impl<'a> From<Theme> for Box<dyn button::StyleSheet + 'a> {
fn from(theme: Theme) -> Self { fn from(theme: Theme) -> Self {
match theme { match theme {
Theme::Light => &light::Button, Theme::Light => light::Button.into(),
Theme::Dark => &dark::Button, Theme::Dark => dark::Button.into(),
} }
} }
} }

8
examples/todos/src/main.rs
View file

@ -304,7 +304,7 @@ impl Task {
Button::new(edit_button, edit_icon()) Button::new(edit_button, edit_icon())
.on_press(TaskMessage::Edit) .on_press(TaskMessage::Edit)
.padding(10) .padding(10)
.style(&style::Button::Icon), .style(style::Button::Icon),
) )
.into() .into()
} }
@ -335,7 +335,7 @@ impl Task {
) )
.on_press(TaskMessage::Delete) .on_press(TaskMessage::Delete)
.padding(10) .padding(10)
.style(&style::Button::Destructive), .style(style::Button::Destructive),
) )
.into() .into()
} }
@ -364,9 +364,9 @@ impl Controls {
let label = Text::new(label).size(16); let label = Text::new(label).size(16);
let button = let button =
Button::new(state, label).style(if filter == current_filter { Button::new(state, label).style(if filter == current_filter {
&style::Button::FilterSelected style::Button::FilterSelected
} else { } else {
&style::Button::FilterActive style::Button::FilterActive
}); });
button.on_press(Message::FilterChanged(filter)).padding(8) button.on_press(Message::FilterChanged(filter)).padding(8)

4
examples/tour/src/main.rs
View file

@ -64,7 +64,7 @@ impl Sandbox for Tour {
controls = controls.push( controls = controls.push(
button(back_button, "Back") button(back_button, "Back")
.on_press(Message::BackPressed) .on_press(Message::BackPressed)
.style(&style::Button::Secondary), .style(style::Button::Secondary),
); );
} }
@ -74,7 +74,7 @@ impl Sandbox for Tour {
controls = controls.push( controls = controls.push(
button(next_button, "Next") button(next_button, "Next")
.on_press(Message::NextPressed) .on_press(Message::NextPressed)
.style(&style::Button::Primary), .style(style::Button::Primary),
); );
} }

9
native/src/widget/button.rs
View file

@ -66,7 +66,7 @@ pub struct Button<'a, Message, Renderer> {
min_width: u32, min_width: u32,
min_height: u32, min_height: u32,
padding: Padding, padding: Padding,
style_sheet: &'a dyn StyleSheet, style_sheet: Box<dyn StyleSheet + 'a>,
} }
impl<'a, Message, Renderer> Button<'a, Message, Renderer> impl<'a, Message, Renderer> Button<'a, Message, Renderer>
@ -131,8 +131,11 @@ where
} }
/// Sets the style of the [`Button`]. /// Sets the style of the [`Button`].
pub fn style(mut self, style_sheet: &'a dyn StyleSheet) -> Self { pub fn style(
self.style_sheet = style_sheet; mut self,
style_sheet: impl Into<Box<dyn StyleSheet + 'a>>,
) -> Self {
self.style_sheet = style_sheet.into();
self self
} }
} }

13
style/src/button.rs
View file

@ -80,8 +80,17 @@ impl StyleSheet for Default {
} }
} }
impl std::default::Default for &'static dyn StyleSheet { impl std::default::Default for Box<dyn StyleSheet> {
fn default() -> Self { fn default() -> Self {
&Default Box::new(Default)
}
}
impl<'a, T> From<T> for Box<dyn StyleSheet + 'a>
where
T: StyleSheet + 'a,
{
fn from(style_sheet: T) -> Self {
Box::new(style_sheet)
} }
} }

6
web/src/widget/button.rs
View file

@ -51,7 +51,7 @@ pub struct Button<'a, Message> {
#[allow(dead_code)] #[allow(dead_code)]
min_height: u32, min_height: u32,
padding: Padding, padding: Padding,
style: &'a dyn StyleSheet, style: Box<dyn StyleSheet + 'a>,
} }
impl<'a, Message> Button<'a, Message> { impl<'a, Message> Button<'a, Message> {
@ -104,8 +104,8 @@ impl<'a, Message> Button<'a, Message> {
} }
/// Sets the style of the [`Button`]. /// Sets the style of the [`Button`].
pub fn style(mut self, style: &'a dyn StyleSheet) -> Self { pub fn style(mut self, style: impl Into<Box<dyn StyleSheet + 'a>>) -> Self {
self.style = style; self.style = style.into();
self self
} }