diff options
Diffstat (limited to 'widget/src/column.rs')
-rw-r--r-- | widget/src/column.rs | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/widget/src/column.rs b/widget/src/column.rs index d6eea84b..faac0e48 100644 --- a/widget/src/column.rs +++ b/widget/src/column.rs @@ -12,17 +12,18 @@ use crate::core::{ /// A container that distributes its contents vertically. #[allow(missing_debug_implementations)] -pub struct Column<'a, Message, Renderer = crate::Renderer> { +pub struct Column<'a, Message, Theme = crate::Theme, Renderer = crate::Renderer> +{ spacing: f32, padding: Padding, width: Length, height: Length, max_width: f32, align_items: Alignment, - children: Vec<Element<'a, Message, Renderer>>, + children: Vec<Element<'a, Message, Theme, Renderer>>, } -impl<'a, Message, Renderer> Column<'a, Message, Renderer> +impl<'a, Message, Theme, Renderer> Column<'a, Message, Theme, Renderer> where Renderer: crate::core::Renderer, { @@ -41,7 +42,7 @@ where /// Creates a [`Column`] with the given elements. pub fn with_children( - children: impl IntoIterator<Item = Element<'a, Message, Renderer>>, + children: impl IntoIterator<Item = Element<'a, Message, Theme, Renderer>>, ) -> Self { children.into_iter().fold(Self::new(), Self::push) } @@ -89,7 +90,7 @@ where /// Adds an element to the [`Column`]. pub fn push( mut self, - child: impl Into<Element<'a, Message, Renderer>>, + child: impl Into<Element<'a, Message, Theme, Renderer>>, ) -> Self { let child = child.into(); let size = child.as_widget().size_hint(); @@ -116,8 +117,8 @@ where } } -impl<'a, Message, Renderer> Widget<Message, Renderer> - for Column<'a, Message, Renderer> +impl<'a, Message, Theme, Renderer> Widget<Message, Theme, Renderer> + for Column<'a, Message, Theme, Renderer> where Renderer: crate::core::Renderer, { @@ -233,7 +234,7 @@ where &self, tree: &Tree, renderer: &mut Renderer, - theme: &Renderer::Theme, + theme: &Theme, style: &renderer::Style, layout: Layout<'_>, cursor: mouse::Cursor, @@ -258,18 +259,19 @@ where tree: &'b mut Tree, layout: Layout<'_>, renderer: &Renderer, - ) -> Option<overlay::Element<'b, Message, Renderer>> { + ) -> Option<overlay::Element<'b, Message, Theme, Renderer>> { overlay::from_children(&mut self.children, tree, layout, renderer) } } -impl<'a, Message, Renderer> From<Column<'a, Message, Renderer>> - for Element<'a, Message, Renderer> +impl<'a, Message, Theme, Renderer> From<Column<'a, Message, Theme, Renderer>> + for Element<'a, Message, Theme, Renderer> where Message: 'a, + Theme: 'a, Renderer: crate::core::Renderer + 'a, { - fn from(column: Column<'a, Message, Renderer>) -> Self { + fn from(column: Column<'a, Message, Theme, Renderer>) -> Self { Self::new(column) } } |