Revert "Add FromIterator for Row and Column"
This reverts commit 06c80c5bce.
This commit is contained in:
parent
06c80c5bce
commit
1355f8d296
2 changed files with 18 additions and 30 deletions
|
|
@ -1,14 +1,14 @@
|
||||||
//! Distribute content vertically.
|
//! 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::event::{self, Event};
|
||||||
use crate::core::layout;
|
use crate::core::layout;
|
||||||
use crate::core::mouse;
|
use crate::core::mouse;
|
||||||
use crate::core::overlay;
|
use crate::core::overlay;
|
||||||
use crate::core::renderer;
|
use crate::core::renderer;
|
||||||
use crate::core::widget::{Operation, Tree};
|
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.
|
/// A container that distributes its contents vertically.
|
||||||
#[allow(missing_debug_implementations)]
|
#[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>
|
impl<'a, Message, Theme, Renderer> Column<'a, Message, Theme, Renderer>
|
||||||
where
|
where
|
||||||
Renderer: crate::core::Renderer,
|
Renderer: crate::core::Renderer,
|
||||||
{
|
{
|
||||||
/// Creates an empty [`Column`].
|
/// Creates an empty [`Column`].
|
||||||
pub fn new() -> Self {
|
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.
|
/// Creates a [`Column`] with the given elements.
|
||||||
pub fn with_children(
|
pub fn with_children(
|
||||||
children: impl IntoIterator<Item=Element<'a, Message, Theme, Renderer>>,
|
children: impl IntoIterator<Item = Element<'a, Message, Theme, Renderer>>,
|
||||||
) -> Self {
|
) -> Self {
|
||||||
let iterator = children.into_iter();
|
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.
|
/// Extends the [`Column`] with the given children.
|
||||||
pub fn extend(
|
pub fn extend(
|
||||||
self,
|
self,
|
||||||
children: impl IntoIterator<Item=Element<'a, Message, Theme, Renderer>>,
|
children: impl IntoIterator<Item = Element<'a, Message, Theme, Renderer>>,
|
||||||
) -> Self {
|
) -> Self {
|
||||||
children.into_iter().fold(self, Self::push)
|
children.into_iter().fold(self, Self::push)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Default for Column<'a, Message, Renderer>
|
impl<'a, Message, Renderer> Default for Column<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Renderer: crate::core::Renderer,
|
Renderer: crate::core::Renderer,
|
||||||
{
|
{
|
||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
Self::new()
|
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>
|
impl<'a, Message, Theme, Renderer> Widget<Message, Theme, Renderer>
|
||||||
for Column<'a, Message, Theme, Renderer>
|
for Column<'a, Message, Theme, Renderer>
|
||||||
where
|
where
|
||||||
Renderer: crate::core::Renderer,
|
Renderer: crate::core::Renderer,
|
||||||
{
|
{
|
||||||
fn children(&self) -> Vec<Tree> {
|
fn children(&self) -> Vec<Tree> {
|
||||||
self.children.iter().map(Tree::new).collect()
|
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>>
|
impl<'a, Message, Theme, Renderer> From<Column<'a, Message, Theme, Renderer>>
|
||||||
for Element<'a, Message, Theme, Renderer>
|
for Element<'a, Message, Theme, Renderer>
|
||||||
where
|
where
|
||||||
Message: 'a,
|
Message: 'a,
|
||||||
Theme: 'a,
|
Theme: 'a,
|
||||||
Renderer: crate::core::Renderer + 'a,
|
Renderer: crate::core::Renderer + 'a,
|
||||||
{
|
{
|
||||||
fn from(column: Column<'a, Message, Theme, Renderer>) -> Self {
|
fn from(column: Column<'a, Message, Theme, Renderer>) -> Self {
|
||||||
Self::new(column)
|
Self::new(column)
|
||||||
|
|
|
||||||
|
|
@ -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>
|
impl<'a, Message, Theme, Renderer> Widget<Message, Theme, Renderer>
|
||||||
for Row<'a, Message, Theme, Renderer>
|
for Row<'a, Message, Theme, Renderer>
|
||||||
where
|
where
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue