Merge branch 'master' into feature/text-selection

3 files changed, 18 insertions, 4 deletions

diff --git a/web/src/lib.rs b/web/src/lib.rs
index 258ad9e7..1de00545 100644
--- a/web/src/lib.rs
+++ b/web/src/lib.rs
@@ -73,8 +73,8 @@ pub use dodrio;
 pub use element::Element;
 pub use hasher::Hasher;
 pub use iced_core::{
-    Align, Background, Color, Font, HorizontalAlignment, Length, Point, Size,
-    Vector, VerticalAlignment,
+    keyboard, Align, Background, Color, Font, HorizontalAlignment, Length,
+    Point, Size, Vector, VerticalAlignment,
 };
 pub use iced_futures::{executor, futures, Command};
 pub use subscription::Subscription;
diff --git a/web/src/widget/column.rs b/web/src/widget/column.rs
index 6454ffba..25b88b0e 100644
--- a/web/src/widget/column.rs
+++ b/web/src/widget/column.rs
@@ -25,6 +25,13 @@ impl<'a, Message> Column<'a, Message> {
     ///
     /// [`Column`]: struct.Column.html
     pub fn new() -> Self {
+        Self::with_children(Vec::new())
+    }
+
+    /// Creates a [`Column`] with the given elements.
+    ///
+    /// [`Column`]: struct.Column.html
+    pub fn with_children(children: Vec<Element<'a, Message>>) -> Self {
         Column {
             spacing: 0,
             padding: 0,
@@ -33,7 +40,7 @@ impl<'a, Message> Column<'a, Message> {
             max_width: u32::MAX,
             max_height: u32::MAX,
             align_items: Align::Start,
-            children: Vec::new(),
+            children,
         }
     }
 
diff --git a/web/src/widget/row.rs b/web/src/widget/row.rs
index 02035113..cfa10fdf 100644
--- a/web/src/widget/row.rs
+++ b/web/src/widget/row.rs
@@ -25,6 +25,13 @@ impl<'a, Message> Row<'a, Message> {
     ///
     /// [`Row`]: struct.Row.html
     pub fn new() -> Self {
+        Self::with_children(Vec::new())
+    }
+
+    /// Creates a [`Row`] with the given elements.
+    ///
+    /// [`Row`]: struct.Row.html
+    pub fn with_children(children: Vec<Element<'a, Message>>) -> Self {
         Row {
             spacing: 0,
             padding: 0,
@@ -33,7 +40,7 @@ impl<'a, Message> Row<'a, Message> {
             max_width: u32::MAX,
             max_height: u32::MAX,
             align_items: Align::Start,
-            children: Vec::new(),
+            children,
         }
     }