From ae123d8f14c14a2c393bcf00dc364844a32cc0c8 Mon Sep 17 00:00:00 2001
From: Rowun Giles <1868220+rowungiles@users.noreply.github.com>
Date: Mon, 16 Mar 2020 10:08:37 +0000
Subject: Instantiate Column and Row with children

---
 web/src/widget/column.rs | 16 ++++++++++++++++
 web/src/widget/row.rs    | 16 ++++++++++++++++
 2 files changed, 32 insertions(+)

(limited to 'web/src/widget')

diff --git a/web/src/widget/column.rs b/web/src/widget/column.rs
index 6454ffba..f1d9f9a2 100644
--- a/web/src/widget/column.rs
+++ b/web/src/widget/column.rs
@@ -37,6 +37,22 @@ impl<'a, Message> Column<'a, Message> {
         }
     }
 
+    /// Creates a [`Column`] with children.
+    ///
+    /// [`Column`]: struct.Column.html
+    pub fn new_with_children(children: Vec<Element<'a, Message>>) -> Self {
+        Column {
+            spacing: 0,
+            padding: 0,
+            width: Length::Fill,
+            height: Length::Shrink,
+            max_width: u32::MAX,
+            max_height: u32::MAX,
+            align_items: Align::Start,
+            children,
+        }
+    }
+
     /// Sets the vertical spacing _between_ elements.
     ///
     /// Custom margins per element do not exist in Iced. You should use this
diff --git a/web/src/widget/row.rs b/web/src/widget/row.rs
index 02035113..55077d52 100644
--- a/web/src/widget/row.rs
+++ b/web/src/widget/row.rs
@@ -37,6 +37,22 @@ impl<'a, Message> Row<'a, Message> {
         }
     }
 
+    /// Creates a [`Row`] with children.
+    ///
+    /// [`Row`]: struct.Row.html
+    pub fn new_with_children(children: Vec<Element<'a, Message>>) -> Self {
+        Row {
+            spacing: 0,
+            padding: 0,
+            width: Length::Fill,
+            height: Length::Shrink,
+            max_width: u32::MAX,
+            max_height: u32::MAX,
+            align_items: Align::Start,
+            children,
+        }
+    }
+
     /// Sets the horizontal spacing _between_ elements.
     ///
     /// Custom margins per element do not exist in Iced. You should use this
-- 
cgit 


From 99b5212550f225a21e1d1144c6fb9ebb8f4e6ed2 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 17 Mar 2020 00:53:51 +0100
Subject: Implement `Column` and `Row` changes in `iced_web`

---
 web/src/widget/column.rs | 15 +++------------
 web/src/widget/row.rs    | 15 +++------------
 2 files changed, 6 insertions(+), 24 deletions(-)

(limited to 'web/src/widget')

diff --git a/web/src/widget/column.rs b/web/src/widget/column.rs
index f1d9f9a2..25b88b0e 100644
--- a/web/src/widget/column.rs
+++ b/web/src/widget/column.rs
@@ -25,22 +25,13 @@ impl<'a, Message> Column<'a, Message> {
     ///
     /// [`Column`]: struct.Column.html
     pub fn new() -> Self {
-        Column {
-            spacing: 0,
-            padding: 0,
-            width: Length::Fill,
-            height: Length::Shrink,
-            max_width: u32::MAX,
-            max_height: u32::MAX,
-            align_items: Align::Start,
-            children: Vec::new(),
-        }
+        Self::with_children(Vec::new())
     }
 
-    /// Creates a [`Column`] with children.
+    /// Creates a [`Column`] with the given elements.
     ///
     /// [`Column`]: struct.Column.html
-    pub fn new_with_children(children: Vec<Element<'a, Message>>) -> Self {
+    pub fn with_children(children: Vec<Element<'a, Message>>) -> Self {
         Column {
             spacing: 0,
             padding: 0,
diff --git a/web/src/widget/row.rs b/web/src/widget/row.rs
index 55077d52..cfa10fdf 100644
--- a/web/src/widget/row.rs
+++ b/web/src/widget/row.rs
@@ -25,22 +25,13 @@ impl<'a, Message> Row<'a, Message> {
     ///
     /// [`Row`]: struct.Row.html
     pub fn new() -> Self {
-        Row {
-            spacing: 0,
-            padding: 0,
-            width: Length::Fill,
-            height: Length::Shrink,
-            max_width: u32::MAX,
-            max_height: u32::MAX,
-            align_items: Align::Start,
-            children: Vec::new(),
-        }
+        Self::with_children(Vec::new())
     }
 
-    /// Creates a [`Row`] with children.
+    /// Creates a [`Row`] with the given elements.
     ///
     /// [`Row`]: struct.Row.html
-    pub fn new_with_children(children: Vec<Element<'a, Message>>) -> Self {
+    pub fn with_children(children: Vec<Element<'a, Message>>) -> Self {
         Row {
             spacing: 0,
             padding: 0,
-- 
cgit