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

Try using closures for Container::style

Browse source 
`Box` should not allocate for zero-sized types; so
we should not be incurring much overhead. Just a
bit of indirection.
This commit is contained in:
Héctor Ramón Jiménez 2024-03-12 13:25:06 +01:00
parent 34317bba5d
commit 2088e5d661
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
5 changed files with 43 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

12
widget/src/pane_grid/content.rs
View file

@ -24,7 +24,7 @@ pub struct Content<
{
title_bar: Option<TitleBar<'a, Message, Theme, Renderer>>,
body: Element<'a, Message, Theme, Renderer>,
style: container::Style<Theme>,
style: container::Style<'a, Theme>,
}
impl<'a, Message, Theme, Renderer> Content<'a, Message, Theme, Renderer>
@ -34,12 +34,12 @@ where
/// Creates a new [`Content`] with the provided body.
pub fn new(body: impl Into<Element<'a, Message, Theme, Renderer>>) -> Self
where
Theme: container::DefaultStyle,
Theme: container::DefaultStyle + 'a,
{
Self {
title_bar: None,
body: body.into(),
style: Theme::default_style(),
style: Box::new(Theme::default_style),
}
}
@ -55,9 +55,9 @@ where
/// Sets the style of the [`Content`].
pub fn style(
mut self,
style: fn(&Theme, container::Status) -> container::Appearance,
style: impl Fn(&Theme, container::Status) -> container::Appearance + 'a,
) -> Self {
self.style = style.into();
self.style = Box::new(style);
self
}
}
@ -403,7 +403,7 @@ impl<'a, T, Message, Theme, Renderer> From<T>
for Content<'a, Message, Theme, Renderer>
where
T: Into<Element<'a, Message, Theme, Renderer>>,
Theme: container::DefaultStyle,
Theme: container::DefaultStyle + 'a,
Renderer: crate::core::Renderer,
{
fn from(element: T) -> Self {

10
widget/src/pane_grid/title_bar.rs
View file

@ -25,7 +25,7 @@ pub struct TitleBar<
controls: Option<Element<'a, Message, Theme, Renderer>>,
padding: Padding,
always_show_controls: bool,
style: container::Style<Theme>,
style: container::Style<'a, Theme>,
}
impl<'a, Message, Theme, Renderer> TitleBar<'a, Message, Theme, Renderer>
@ -37,14 +37,14 @@ where
content: impl Into<Element<'a, Message, Theme, Renderer>>,
) -> Self
where
Theme: container::DefaultStyle,
Theme: container::DefaultStyle + 'a,
{
Self {
content: content.into(),
controls: None,
padding: Padding::ZERO,
always_show_controls: false,
style: Theme::default_style(),
style: Box::new(Theme::default_style),
}
}
@ -66,9 +66,9 @@ where
/// Sets the style of the [`TitleBar`].
pub fn style(
mut self,
style: fn(&Theme, container::Status) -> container::Appearance,
style: impl Fn(&Theme, container::Status) -> container::Appearance + 'a,
) -> Self {
self.style = style.into();
self.style = Box::new(style);
self
}