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

Use Style struct pattern instead of trait for all widgets

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-03-06 20:30:58 +01:00
parent 8a63774b24
commit 34e7c6593a
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
25 changed files with 466 additions and 282 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: fn(&Theme, container::Status) -> container::Appearance,
style: container::Style<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::Style,
container::Style<Theme>: Default,
{
Self {
title_bar: None,
body: body.into(),
style: Theme::style(),
style: container::Style::default(),
}
}
@ -57,7 +57,7 @@ where
mut self,
style: fn(&Theme, container::Status) -> container::Appearance,
) -> Self {
self.style = style;
self.style = style.into();
self
}
}
@ -114,7 +114,7 @@ where
container::Status::Idle
};
(self.style)(theme, status)
self.style.resolve(theme, status)
};
container::draw_background(renderer, &style, bounds);
@ -403,8 +403,8 @@ impl<'a, T, Message, Theme, Renderer> From<T>
for Content<'a, Message, Theme, Renderer>
where
T: Into<Element<'a, Message, Theme, Renderer>>,
Theme: container::Style,
Renderer: crate::core::Renderer,
container::Style<Theme>: Default,
{
fn from(element: T) -> Self {
Self::new(element)

15
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: fn(&Theme, container::Status) -> container::Appearance,
style: container::Style<Theme>,
}
impl<'a, Message, Theme, Renderer> TitleBar<'a, Message, Theme, Renderer>
@ -33,17 +33,18 @@ where
Renderer: crate::core::Renderer,
{
/// Creates a new [`TitleBar`] with the given content.
pub fn new<E>(content: E) -> Self
pub fn new(
content: impl Into<Element<'a, Message, Theme, Renderer>>,
) -> Self
where
Theme: container::Style,
E: Into<Element<'a, Message, Theme, Renderer>>,
container::Style<Theme>: Default,
{
Self {
content: content.into(),
controls: None,
padding: Padding::ZERO,
always_show_controls: false,
style: Theme::style(),
style: container::Style::default(),
}
}
@ -67,7 +68,7 @@ where
mut self,
style: fn(&Theme, container::Status) -> container::Appearance,
) -> Self {
self.style = style;
self.style = style.into();
self
}
@ -137,7 +138,7 @@ where
container::Status::Idle
};
(self.style)(theme, status)
self.style.resolve(theme, status)
};
let inherited_style = renderer::Style {