From 9f0bbf6020146d16521dd301b925f710d85dc92d Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Mon, 19 Feb 2024 08:42:58 +0100 Subject: Add `extend` method to `Column` and `Row` --- widget/src/column.rs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'widget/src/column.rs') diff --git a/widget/src/column.rs b/widget/src/column.rs index b9eb5d93..0c5ea75e 100644 --- a/widget/src/column.rs +++ b/widget/src/column.rs @@ -46,7 +46,7 @@ where pub fn with_children( children: impl IntoIterator>, ) -> Self { - children.into_iter().fold(Self::new(), Self::push) + Self::new().extend(children) } /// Sets the vertical spacing _between_ elements. @@ -127,6 +127,14 @@ where self } } + + /// Extends the [`Column`] with the given children. + pub fn extend( + self, + children: impl IntoIterator>, + ) -> Self { + children.into_iter().fold(self, Self::push) + } } impl<'a, Message, Renderer> Default for Column<'a, Message, Renderer> -- cgit From e60dabddefd6608a34ecb3f21a0fd53fef6d1f07 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Mon, 19 Feb 2024 08:49:28 +0100 Subject: Add `from_vec` method to `Column` and `Row` --- widget/src/column.rs | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) (limited to 'widget/src/column.rs') diff --git a/widget/src/column.rs b/widget/src/column.rs index 0c5ea75e..e59a0809 100644 --- a/widget/src/column.rs +++ b/widget/src/column.rs @@ -30,7 +30,27 @@ where { /// Creates an empty [`Column`]. pub fn new() -> Self { - Column { + Self::from_vec(Vec::new()) + } + + /// Creates a [`Column`] with the given elements. + pub fn with_children( + children: impl IntoIterator>, + ) -> Self { + Self::new().extend(children) + } + + /// Creates a [`Column`] from an already allocated [`Vec`]. + /// + /// Keep in mind that the [`Column`] will not inspect the [`Vec`], which means + /// it won't automatically adapt to the sizing strategy of its contents. + /// + /// If any of the children have a [`Length::Fill`] strategy, you will need to + /// call [`Column::width`] or [`Column::height`] accordingly. + pub fn from_vec( + children: Vec>, + ) -> Self { + Self { spacing: 0.0, padding: Padding::ZERO, width: Length::Shrink, @@ -38,17 +58,10 @@ where max_width: f32::INFINITY, align_items: Alignment::Start, clip: false, - children: Vec::new(), + children, } } - /// Creates a [`Column`] with the given elements. - pub fn with_children( - children: impl IntoIterator>, - ) -> Self { - Self::new().extend(children) - } - /// Sets the vertical spacing _between_ elements. /// /// Custom margins per element do not exist in iced. You should use this -- cgit