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

Use closures for Checkbox::style

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-03-12 14:58:06 +01:00
parent d0a1da194a
commit 252eb88703
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
3 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

25
widget/src/checkbox.rs
View file

@ -51,7 +51,7 @@ pub struct Checkbox<
text_shaping: text::Shaping,
font: Option<Renderer::Font>,
icon: Icon<Renderer::Font>,
style: Style<Theme>,
style: Style<'a, Theme>,
}
impl<'a, Message, Theme, Renderer> Checkbox<'a, Message, Theme, Renderer>
@ -71,7 +71,7 @@ where
/// * a boolean describing whether the [`Checkbox`] is checked or not
pub fn new(label: impl Into<String>, is_checked: bool) -> Self
where
Theme: DefaultStyle,
Theme: DefaultStyle + 'a,
{
Checkbox {
is_checked,
@ -91,7 +91,7 @@ where
line_height: text::LineHeight::default(),
shaping: text::Shaping::Basic,
},
style: Theme::default_style(),
style: Box::new(Theme::default_style),
}
}
@ -174,8 +174,11 @@ where
}
/// Sets the style of the [`Checkbox`].
pub fn style(mut self, style: fn(&Theme, Status) -> Appearance) -> Self {
self.style = style;
pub fn style(
mut self,
style: impl Fn(&Theme, Status) -> Appearance + 'a,
) -> Self {
self.style = Box::new(style);
self
}
}
@ -424,23 +427,23 @@ pub struct Appearance {
}
/// The style of a [`Checkbox`].
pub type Style<Theme> = fn(&Theme, Status) -> Appearance;
pub type Style<'a, Theme> = Box<dyn Fn(&Theme, Status) -> Appearance + 'a>;
/// The default style of a [`Checkbox`].
pub trait DefaultStyle {
/// Returns the default style of a [`Checkbox`].
fn default_style() -> Style<Self>;
fn default_style(&self, status: Status) -> Appearance;
}
impl DefaultStyle for Theme {
fn default_style() -> Style<Self> {
primary
fn default_style(&self, status: Status) -> Appearance {
primary(self, status)
}
}
impl DefaultStyle for Appearance {
fn default_style() -> Style<Self> {
|appearance, _status| *appearance
fn default_style(&self, _status: Status) -> Appearance {
*self
}
}