leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

theme: Use boxed functions instead fn pointers (#99)

Browse source 
This is more general, and necessary if the custom theming is dynamically
generated.

Iced's builtin theme also uses `Box`ed `Fn`, or `Rc` where clone is
required, so this seems reasonable.

Only `Text` is left using `fn`, since it needs to be `Copy`. Hopefully
that can be changed in Iced at some point.

`::custom` methods are added to make these variants a little more
convenient to construct. This replaces a couple `From` implementations,
which are potentially problematic with a generic.
This commit is contained in:
Ian Douglas Scott 2023-04-28 16:04:57 -07:00 • committed by GitHub
parent c878e24465
commit b85c504d72
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 65 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/applet/mod.rs
View file

@ -19,16 +19,18 @@ pub use cosmic_panel_config;
const APPLET_PADDING: u32 = 8;
pub const APPLET_BUTTON_THEME: Button = Button::Custom {
active: |t| iced_style::button::Appearance {
border_radius: BorderRadius::from(0.0),
..t.active(&Button::Text)
},
hover: |t| iced_style::button::Appearance {
border_radius: BorderRadius::from(0.0),
..t.hovered(&Button::Text)
},
};
pub fn applet_button_theme() -> Button {
Button::Custom {
active: Box::new(|t| iced_style::button::Appearance {
border_radius: BorderRadius::from(0.0),
..t.active(&Button::Text)
}),
hover: Box::new(|t| iced_style::button::Appearance {
border_radius: BorderRadius::from(0.0),
..t.hovered(&Button::Text)
}),
}
}
#[derive(Debug, Clone)]
pub struct CosmicAppletHelper {
@ -130,7 +132,7 @@ impl CosmicAppletHelper {
};
Container::<Message, Renderer>::new(Container::<Message, Renderer>::new(content).style(
crate::theme::Container::Custom(|theme| Appearance {
crate::theme::Container::custom(|theme| Appearance {
text_color: Some(theme.cosmic().background.on.into()),
background: Some(Color::from(theme.cosmic().background.base).into()),
border_radius: 12.0,