summaryrefslogtreecommitdiffstats
path: root/widget
diff options
context:
space:
mode:
authorLibravatar Andrew-Schwartz <andrewschwartz59@gmail.com>2024-06-12 13:00:02 -0400
committerLibravatar Andrew-Schwartz <andrewschwartz59@gmail.com>2024-06-12 13:00:02 -0400
commit1355f8d296fea59bafac600982fafb23d8aac602 (patch)
tree916f837424c3baeacc1e0f43b02bc892a3445cbb /widget
parent06c80c5bcedd8dba187af9d187ba1ae40fa4dafa (diff)
downloadiced-1355f8d296fea59bafac600982fafb23d8aac602.tar.gz
iced-1355f8d296fea59bafac600982fafb23d8aac602.tar.bz2
iced-1355f8d296fea59bafac600982fafb23d8aac602.zip
Revert "Add FromIterator for Row and Column"
This reverts commit 06c80c5bcedd8dba187af9d187ba1ae40fa4dafa.
Diffstat (limited to 'widget')
-rw-r--r--widget/src/column.rs42
-rw-r--r--widget/src/row.rs6
2 files changed, 18 insertions, 30 deletions
diff --git a/widget/src/column.rs b/widget/src/column.rs
index 708c0806..df7829b3 100644
--- a/widget/src/column.rs
+++ b/widget/src/column.rs
@@ -1,14 +1,14 @@
//! Distribute content vertically.
-use crate::core::{
- Alignment, Clipboard, Element, Layout, Length, Padding, Pixels, Rectangle,
- Shell, Size, Vector, Widget,
-};
use crate::core::event::{self, Event};
use crate::core::layout;
use crate::core::mouse;
use crate::core::overlay;
use crate::core::renderer;
use crate::core::widget::{Operation, Tree};
+use crate::core::{
+ Alignment, Clipboard, Element, Layout, Length, Padding, Pixels, Rectangle,
+ Shell, Size, Vector, Widget,
+};
/// A container that distributes its contents vertically.
#[allow(missing_debug_implementations)]
@@ -25,8 +25,8 @@ pub struct Column<'a, Message, Theme = crate::Theme, Renderer = crate::Renderer>
}
impl<'a, Message, Theme, Renderer> Column<'a, Message, Theme, Renderer>
- where
- Renderer: crate::core::Renderer,
+where
+ Renderer: crate::core::Renderer,
{
/// Creates an empty [`Column`].
pub fn new() -> Self {
@@ -40,7 +40,7 @@ impl<'a, Message, Theme, Renderer> Column<'a, Message, Theme, Renderer>
/// Creates a [`Column`] with the given elements.
pub fn with_children(
- children: impl IntoIterator<Item=Element<'a, Message, Theme, Renderer>>,
+ children: impl IntoIterator<Item = Element<'a, Message, Theme, Renderer>>,
) -> Self {
let iterator = children.into_iter();
@@ -146,31 +146,25 @@ impl<'a, Message, Theme, Renderer> Column<'a, Message, Theme, Renderer>
/// Extends the [`Column`] with the given children.
pub fn extend(
self,
- children: impl IntoIterator<Item=Element<'a, Message, Theme, Renderer>>,
+ children: impl IntoIterator<Item = Element<'a, Message, Theme, Renderer>>,
) -> Self {
children.into_iter().fold(self, Self::push)
}
}
impl<'a, Message, Renderer> Default for Column<'a, Message, Renderer>
- where
- Renderer: crate::core::Renderer,
+where
+ Renderer: crate::core::Renderer,
{
fn default() -> Self {
Self::new()
}
}
-impl<'a, Message, Theme, Renderer: crate::core::Renderer> FromIterator<Element<'a, Message, Theme, Renderer>> for Column<'a, Message, Theme, Renderer> {
- fn from_iter<T: IntoIterator<Item=Element<'a, Message, Theme, Renderer>>>(iter: T) -> Self {
- Self::with_children(iter)
- }
-}
-
impl<'a, Message, Theme, Renderer> Widget<Message, Theme, Renderer>
-for Column<'a, Message, Theme, Renderer>
- where
- Renderer: crate::core::Renderer,
+ for Column<'a, Message, Theme, Renderer>
+where
+ Renderer: crate::core::Renderer,
{
fn children(&self) -> Vec<Tree> {
self.children.iter().map(Tree::new).collect()
@@ -332,11 +326,11 @@ for Column<'a, Message, Theme, 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,
+ for Element<'a, Message, Theme, Renderer>
+where
+ Message: 'a,
+ Theme: 'a,
+ Renderer: crate::core::Renderer + 'a,
{
fn from(column: Column<'a, Message, Theme, Renderer>) -> Self {
Self::new(column)
diff --git a/widget/src/row.rs b/widget/src/row.rs
index 5a6b368a..fa352171 100644
--- a/widget/src/row.rs
+++ b/widget/src/row.rs
@@ -152,12 +152,6 @@ where
}
}
-impl<'a, Message, Theme, Renderer: crate::core::Renderer> FromIterator<Element<'a, Message, Theme, Renderer>> for Row<'a, Message, Theme, Renderer> {
- fn from_iter<T: IntoIterator<Item=Element<'a, Message, Theme, Renderer>>>(iter: T) -> Self {
- Self::with_children(iter)
- }
-}
-
impl<'a, Message, Theme, Renderer> Widget<Message, Theme, Renderer>
for Row<'a, Message, Theme, Renderer>
where