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

Wire up container styling to iced_native

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2021-10-18 15:36:32 +07:00
parent edea093350
commit d61cb58d92
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
17 changed files with 65 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

11
native/src/widget/pane_grid/content.rs
View file

@ -13,7 +13,7 @@ use crate::{Clipboard, Element, Hasher, Layout, Point, Rectangle, Size};
pub struct Content<'a, Message, Renderer: pane_grid::Renderer> {
title_bar: Option<TitleBar<'a, Message, Renderer>>,
body: Element<'a, Message, Renderer>,
style: <Renderer as container::Renderer>::Style,
style: &'a dyn container::StyleSheet,
}
impl<'a, Message, Renderer> Content<'a, Message, Renderer>
@ -39,11 +39,8 @@ where
}
/// Sets the style of the [`Content`].
pub fn style(
mut self,
style: impl Into<<Renderer as container::Renderer>::Style>,
) -> Self {
self.style = style.into();
pub fn style(mut self, style: &'a dyn container::StyleSheet) -> Self {
self.style = style;
self
}
}
@ -217,7 +214,7 @@ where
impl<'a, T, Message, Renderer> From<T> for Content<'a, Message, Renderer>
where
T: Into<Element<'a, Message, Renderer>>,
Renderer: pane_grid::Renderer + container::Renderer,
Renderer: pane_grid::Renderer,
{
fn from(element: T) -> Self {
Self::new(element)

9
native/src/widget/pane_grid/title_bar.rs
View file

@ -17,7 +17,7 @@ pub struct TitleBar<'a, Message, Renderer: pane_grid::Renderer> {
controls: Option<Element<'a, Message, Renderer>>,
padding: Padding,
always_show_controls: bool,
style: <Renderer as container::Renderer>::Style,
style: &'a dyn container::StyleSheet,
}
impl<'a, Message, Renderer> TitleBar<'a, Message, Renderer>
@ -54,11 +54,8 @@ where
}
/// Sets the style of the [`TitleBar`].
pub fn style(
mut self,
style: impl Into<<Renderer as container::Renderer>::Style>,
) -> Self {
self.style = style.into();
pub fn style(mut self, style: &'a dyn container::StyleSheet) -> Self {
self.style = style;
self
}