Implement theme styling for PaneGrid

This commit is contained in:
Héctor Ramón Jiménez 2022-06-01 01:44:59 +02:00
parent a206d22670
commit 6f69df3d41
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
4 changed files with 74 additions and 49 deletions

View file

@ -83,7 +83,11 @@ pub use iced_style::pane_grid::{Line, StyleSheet};
/// .on_resize(10, Message::PaneResized);
/// ```
#[allow(missing_debug_implementations)]
pub struct PaneGrid<'a, Message, Renderer> {
pub struct PaneGrid<'a, Message, Renderer>
where
Renderer: iced_native::Renderer,
Renderer::Theme: StyleSheet,
{
state: &'a state::Internal,
elements: Vec<(Pane, Content<'a, Message, Renderer>)>,
width: Length,
@ -92,12 +96,13 @@ pub struct PaneGrid<'a, Message, Renderer> {
on_click: Option<Box<dyn Fn(Pane) -> Message + 'a>>,
on_drag: Option<Box<dyn Fn(DragEvent) -> Message + 'a>>,
on_resize: Option<(u16, Box<dyn Fn(ResizeEvent) -> Message + 'a>)>,
style_sheet: Box<dyn StyleSheet + 'a>,
style: <Renderer::Theme as StyleSheet>::Style,
}
impl<'a, Message, Renderer> PaneGrid<'a, Message, Renderer>
where
Renderer: iced_native::Renderer,
Renderer::Theme: StyleSheet,
{
/// Creates a [`PaneGrid`] with the given [`State`] and view function.
///
@ -124,7 +129,7 @@ where
on_click: None,
on_drag: None,
on_resize: None,
style_sheet: Default::default(),
style: Default::default(),
}
}
@ -184,8 +189,11 @@ where
}
/// Sets the style of the [`PaneGrid`].
pub fn style(mut self, style: impl Into<Box<dyn StyleSheet + 'a>>) -> Self {
self.style_sheet = style.into();
pub fn style(
mut self,
style: impl Into<<Renderer::Theme as StyleSheet>::Style>,
) -> Self {
self.style = style.into();
self
}
}
@ -194,6 +202,7 @@ impl<'a, Message, Renderer> Widget<Message, Renderer>
for PaneGrid<'a, Message, Renderer>
where
Renderer: iced_native::Renderer,
Renderer::Theme: StyleSheet,
{
fn tag(&self) -> tree::Tag {
tree::Tag::of::<state::Action>()
@ -343,11 +352,12 @@ where
layout,
cursor_position,
renderer,
theme,
style,
viewport,
self.spacing,
self.on_resize.as_ref().map(|(leeway, _)| *leeway),
self.style_sheet.as_ref(),
self.style,
self.elements
.iter()
.zip(&tree.children)
@ -391,8 +401,9 @@ where
impl<'a, Message, Renderer> From<PaneGrid<'a, Message, Renderer>>
for Element<'a, Message, Renderer>
where
Renderer: 'a + iced_native::Renderer,
Message: 'a,
Renderer: 'a + iced_native::Renderer,
Renderer::Theme: StyleSheet,
{
fn from(
pane_grid: PaneGrid<'a, Message, Renderer>,