Draft new layout API

20 files changed, 161 insertions, 456 deletions

diff --git a/native/Cargo.toml b/native/Cargo.toml
index bb6139d6..38db1610 100644
--- a/native/Cargo.toml
+++ b/native/Cargo.toml
@@ -9,6 +9,5 @@ repository = "https://github.com/hecrj/iced"
 
 [dependencies]
 iced_core = { version = "0.1.0-alpha", path = "../core" }
-stretch = "0.2"
 twox-hash = "1.5"
 raw-window-handle = "0.3"
diff --git a/native/src/element.rs b/native/src/element.rs
index be64a981..acae1135 100644
--- a/native/src/element.rs
+++ b/native/src/element.rs
@@ -1,6 +1,4 @@
-use stretch::{geometry, result};
-
-use crate::{renderer, Color, Event, Hasher, Layout, Node, Point, Widget};
+use crate::{layout, renderer, Color, Event, Hasher, Layout, Point, Widget};
 
 /// A generic [`Widget`].
 ///
@@ -41,14 +39,18 @@ where
         }
     }
 
-    pub fn node(&self, renderer: &Renderer) -> Node {
-        self.widget.node(renderer)
+    pub fn layout(
+        &self,
+        renderer: &Renderer,
+        limits: &layout::Limits,
+    ) -> Layout {
+        self.widget.layout(renderer, limits)
     }
 
     pub fn draw(
         &self,
         renderer: &mut Renderer,
-        layout: Layout<'_>,
+        layout: &Layout,
         cursor_position: Point,
     ) -> Renderer::Output {
         self.widget.draw(renderer, layout, cursor_position)
@@ -247,12 +249,6 @@ where
         }
     }
 
-    pub(crate) fn compute_layout(&self, renderer: &Renderer) -> result::Layout {
-        let node = self.widget.node(renderer);
-
-        node.0.compute_layout(geometry::Size::undefined()).unwrap()
-    }
-
     pub(crate) fn hash_layout(&self, state: &mut Hasher) {
         self.widget.hash_layout(state);
     }
@@ -289,14 +285,14 @@ where
     A: Clone,
     Renderer: crate::Renderer,
 {
-    fn node(&self, renderer: &Renderer) -> Node {
-        self.widget.node(renderer)
+    fn layout(&self, renderer: &Renderer, limits: &layout::Limits) -> Layout {
+        self.widget.layout(renderer, limits)
     }
 
     fn on_event(
         &mut self,
         event: Event,
-        layout: Layout<'_>,
+        layout: &Layout,
         cursor_position: Point,
         messages: &mut Vec<B>,
         renderer: &Renderer,
@@ -320,7 +316,7 @@ where
     fn draw(
         &self,
         renderer: &mut Renderer,
-        layout: Layout<'_>,
+        layout: &Layout,
         cursor_position: Point,
     ) -> Renderer::Output {
         self.widget.draw(renderer, layout, cursor_position)
@@ -361,14 +357,14 @@ impl<'a, Message, Renderer> Widget<Message, Renderer>
 where
     Renderer: crate::Renderer + renderer::Debugger,
 {
-    fn node(&self, renderer: &Renderer) -> Node {
-        self.element.widget.node(renderer)
+    fn layout(&self, renderer: &Renderer, limits: &layout::Limits) -> Layout {
+        self.element.widget.layout(renderer, limits)
     }
 
     fn on_event(
         &mut self,
         event: Event,
-        layout: Layout<'_>,
+        layout: &Layout,
         cursor_position: Point,
         messages: &mut Vec<Message>,
         renderer: &Renderer,
@@ -385,7 +381,7 @@ where
     fn draw(
         &self,
         renderer: &mut Renderer,
-        layout: Layout<'_>,
+        layout: &Layout,
         cursor_position: Point,
     ) -> Renderer::Output {
         renderer.explain(
diff --git a/native/src/layout.rs b/native/src/layout.rs
index 32630f35..520bcd88 100644
--- a/native/src/layout.rs
+++ b/native/src/layout.rs
@@ -1,6 +1,8 @@
-use stretch::result;
+use crate::Rectangle;
 
-use crate::{Point, Rectangle, Vector};
+mod limits;
+
+pub use limits::Limits;
 
 /// The computed bounds of a [`Node`] and its children.
 ///
@@ -12,25 +14,25 @@ use crate::{Point, Rectangle, Vector};
 /// [`Widget::on_event`]: widget/trait.Widget.html#method.on_event
 /// [`Widget::draw`]: widget/trait.Widget.html#tymethod.draw
 /// [`Widget::node`]: widget/trait.Widget.html#tymethod.node
-#[derive(Debug, Clone, Copy)]
-pub struct Layout<'a> {
-    layout: &'a result::Layout,
-    position: Point,
+#[derive(Debug, Clone)]
+pub struct Layout {
+    bounds: Rectangle,
+    children: Vec<Layout>,
 }
 
-impl<'a> Layout<'a> {
-    pub(crate) fn new(layout: &'a result::Layout) -> Self {
-        Self::with_parent_position(layout, Point::new(0.0, 0.0))
+impl Layout {
+    pub fn new(bounds: Rectangle) -> Self {
+        Layout {
+            bounds,
+            children: Vec::new(),
+        }
     }
 
-    fn with_parent_position(
-        layout: &'a result::Layout,
-        parent_position: Point,
-    ) -> Self {
-        let position =
-            parent_position + Vector::new(layout.location.x, layout.location.y);
+    pub fn push(&mut self, mut child: Layout) {
+        child.bounds.x += self.bounds.x;
+        child.bounds.y += self.bounds.y;
 
-        Layout { layout, position }
+        self.children.push(child);
     }
 
     /// Gets the bounds of the [`Layout`].
@@ -42,21 +44,14 @@ impl<'a> Layout<'a> {
     /// [`Rectangle`]: struct.Rectangle.html
     /// [`Node`]: struct.Node.html
     pub fn bounds(&self) -> Rectangle {
-        Rectangle {
-            x: self.position.x,
-            y: self.position.y,
-            width: self.layout.size.width,
-            height: self.layout.size.height,
-        }
+        self.bounds
     }
 
     /// Returns an iterator over the [`Layout`] of the children of a [`Node`].
     ///
     /// [`Layout`]: struct.Layout.html
     /// [`Node`]: struct.Node.html
-    pub fn children(&'a self) -> impl Iterator<Item = Layout<'a>> {
-        self.layout.children.iter().map(move |layout| {
-            Layout::with_parent_position(layout, self.position)
-        })
+    pub fn children(&self) -> impl Iterator<Item = &Layout> {
+        self.children.iter()
     }
 }
diff --git a/native/src/layout/limits.rs b/native/src/layout/limits.rs
new file mode 100644
index 00000000..ad105119
--- /dev/null
+++ b/native/src/layout/limits.rs
@@ -0,0 +1,6 @@
+#[derive(Debug)]
+pub struct Limits {}
+
+impl Limits {
+    pub const NONE: Limits = Limits {};
+}
diff --git a/native/src/lib.rs b/native/src/lib.rs
index 56399e57..d2388ee2 100644
--- a/native/src/lib.rs
+++ b/native/src/lib.rs
@@ -199,32 +199,25 @@
 #![deny(unsafe_code)]
 #![deny(rust_2018_idioms)]
 pub mod input;
+pub mod layout;
 pub mod renderer;
 pub mod widget;
 
 mod element;
 mod event;
 mod hasher;
-mod layout;
 mod mouse_cursor;
-mod node;
-mod style;
 mod user_interface;
 
 pub use iced_core::{
     Align, Background, Color, Justify, Length, Point, Rectangle, Vector,
 };
 
-#[doc(no_inline)]
-pub use stretch::{geometry::Size, number::Number};
-
 pub use element::Element;
 pub use event::Event;
 pub use hasher::Hasher;
 pub use layout::Layout;
 pub use mouse_cursor::MouseCursor;
-pub use node::Node;
 pub use renderer::Renderer;
-pub use style::Style;
 pub use user_interface::{Cache, UserInterface};
 pub use widget::*;
diff --git a/native/src/node.rs b/native/src/node.rs
deleted file mode 100644
index 1db10d7f..00000000
--- a/native/src/node.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-use stretch::node;
-
-use crate::{Number, Size, Style};
-
-/// The visual requirements of a [`Widget`] and its children.
-///
-/// When there have been changes and the [`Layout`] needs to be recomputed, the
-/// runtime obtains a [`Node`] by calling [`Widget::node`].
-///
-/// [`Style`]: struct.Style.html
-/// [`Widget`]: widget/trait.Widget.html
-/// [`Node`]: struct.Node.html
-/// [`Widget::node`]: widget/trait.Widget.html#tymethod.node
-/// [`Layout`]: struct.Layout.html
-#[derive(Debug)]
-pub struct Node(pub(crate) node::Node);
-
-impl Node {
-    /// Creates a new [`Node`] with the given [`Style`].
-    ///
-    /// [`Node`]: struct.Node.html
-    /// [`Style`]: struct.Style.html
-    pub fn new(style: Style) -> Node {
-        Self::with_children(style, Vec::new())
-    }
-
-    /// Creates a new [`Node`] with the given [`Style`] and a measure function.
-    ///
-    /// This type of node cannot have any children.
-    ///
-    /// You should use this when your [`Widget`] can adapt its contents to the
-    /// size of its container. The measure function will receive the container
-    /// size as a parameter and must compute the size of the [`Node`] inside
-    /// the given bounds (if the `Number` for a dimension is `Undefined` it
-    /// means that it has no boundary).
-    ///
-    /// [`Node`]: struct.Node.html
-    /// [`Style`]: struct.Style.html
-    /// [`Widget`]: widget/trait.Widget.html
-    pub fn with_measure<F>(style: Style, measure: F) -> Node
-    where
-        F: 'static + Fn(Size<Number>) -> Size<f32>,
-    {
-        Node(node::Node::new_leaf(
-            style.0,
-            Box::new(move |size| Ok(measure(size))),
-        ))
-    }
-
-    /// Creates a new [`Node`] with the given [`Style`] and children.
-    ///
-    /// [`Node`]: struct.Node.html
-    /// [`Style`]: struct.Style.html
-    pub fn with_children(style: Style, children: Vec<Node>) -> Node {
-        Node(node::Node::new(
-            style.0,
-            children.iter().map(|c| &c.0).collect(),
-        ))
-    }
-}
diff --git a/native/src/renderer/debugger.rs b/native/src/renderer/debugger.rs
index 4cc50661..4184860e 100644
--- a/native/src/renderer/debugger.rs
+++ b/native/src/renderer/debugger.rs
@@ -18,7 +18,7 @@ pub trait Debugger: super::Renderer {
     fn explain<Message>(
         &mut self,
         widget: &dyn Widget<Message, Self>,
-        layout: Layout<'_>,
+        layout: &Layout,
         cursor_position: Point,
         color: Color,
     ) -> Self::Output;
diff --git a/native/src/style.rs b/native/src/style.rs
deleted file mode 100644
index 70a7ff74..00000000
--- a/native/src/style.rs
+++ /dev/null
@@ -1,156 +0,0 @@
-use crate::{Align, Justify, Length};
-
-use stretch::style;
-
-/// The appearance of a [`Node`].
-///
-/// [`Node`]: struct.Node.html
-#[derive(Debug, Clone, Copy)]
-pub struct Style(pub(crate) style::Style);
-
-impl Default for Style {
-    fn default() -> Style {
-        Style::new()
-    }
-}
-
-impl Style {
-    /// Creates a new [`Style`].
-    ///
-    /// [`Style`]: struct.Style.html
-    pub fn new() -> Self {
-        Style(style::Style {
-            align_items: style::AlignItems::FlexStart,
-            justify_content: style::JustifyContent::FlexStart,
-            ..style::Style::default()
-        })
-    }
-
-    /// Defines the width of a [`Node`].
-    ///
-    /// [`Node`]: struct.Node.html
-    pub fn width(mut self, width: Length) -> Self {
-        self.0.size.width = into_dimension(width);
-        self
-    }
-
-    /// Defines the height of a [`Node`].
-    ///
-    /// [`Node`]: struct.Node.html
-    pub fn height(mut self, height: Length) -> Self {
-        self.0.size.height = into_dimension(height);
-        self
-    }
-
-    /// Defines the minimum width of a [`Node`].
-    ///
-    /// [`Node`]: struct.Node.html
-    pub fn min_width(mut self, min_width: Length) -> Self {
-        self.0.min_size.width = into_dimension(min_width);
-        self
-    }
-
-    /// Defines the maximum width of a [`Node`].
-    ///
-    /// [`Node`]: struct.Node.html
-    pub fn max_width(mut self, max_width: Length) -> Self {
-        self.0.max_size.width = into_dimension(max_width);
-        self
-    }
-
-    /// Defines the minimum height of a [`Node`].
-    ///
-    /// [`Node`]: struct.Node.html
-    pub fn min_height(mut self, min_height: Length) -> Self {
-        self.0.min_size.height = into_dimension(min_height);
-        self
-    }
-
-    /// Defines the maximum height of a [`Node`].
-    ///
-    /// [`Node`]: struct.Node.html
-    pub fn max_height(mut self, max_height: Length) -> Self {
-        self.0.max_size.height = into_dimension(max_height);
-        self
-    }
-
-    pub fn align_items(mut self, align: Align) -> Self {
-        self.0.align_items = into_align_items(align);
-        self
-    }
-
-    pub fn justify_content(mut self, justify: Justify) -> Self {
-        self.0.justify_content = into_justify_content(justify);
-        self
-    }
-
-    /// Sets the alignment of a [`Node`].
-    ///
-    /// If the [`Node`] is inside a...
-    ///
-    ///   * [`Column`], this setting will affect its __horizontal__ alignment.
-    ///   * [`Row`], this setting will affect its __vertical__ alignment.
-    ///
-    /// [`Node`]: struct.Node.html
-    /// [`Column`]: widget/struct.Column.html
-    /// [`Row`]: widget/struct.Row.html
-    pub fn align_self(mut self, align: Option<Align>) -> Self {
-        self.0.align_self = match align {
-            Some(align) => into_align_self(align),
-            None => stretch::style::AlignSelf::Auto,
-        };
-
-        self
-    }
-
-    /// Sets the padding of a [`Node`].
-    ///
-    /// [`Node`]: struct.Node.html
-    pub fn padding(mut self, units: u16) -> Self {
-        self.0.padding = stretch::geometry::Rect {
-            start: style::Dimension::Points(units as f32),
-            end: style::Dimension::Points(units as f32),
-            top: style::Dimension::Points(units as f32),
-            bottom: style::Dimension::Points(units as f32),
-        };
-
-        self
-    }
-}
-
-fn into_dimension(length: Length) -> style::Dimension {
-    match length {
-        Length::Shrink => style::Dimension::Undefined,
-        Length::Fill => style::Dimension::Percent(1.0),
-        Length::Units(units) => style::Dimension::Points(units as f32),
-    }
-}
-
-fn into_align_items(align: Align) -> style::AlignItems {
-    match align {
-        Align::Start => style::AlignItems::FlexStart,
-        Align::Center => style::AlignItems::Center,
-        Align::End => style::AlignItems::FlexEnd,
-        Align::Stretch => style::AlignItems::Stretch,
-    }
-}
-
-fn into_align_self(align: Align) -> style::AlignSelf {
-    match align {
-        Align::Start => style::AlignSelf::FlexStart,
-        Align::Center => style::AlignSelf::Center,
-        Align::End => style::AlignSelf::FlexEnd,
-        Align::Stretch => style::AlignSelf::Stretch,
-    }
-}
-
-fn into_justify_content(justify: Justify) -> style::JustifyContent {
-    match justify {
-        Justify::Start => style::JustifyContent::FlexStart,
-        Justify::Center => style::JustifyContent::Center,
-        Justify::End => style::JustifyContent::FlexEnd,
-        Justify::SpaceBetween => style::JustifyContent::SpaceBetween,
-        Justify::SpaceAround => style::JustifyContent::SpaceAround,
-        Justify::SpaceEvenly => style::JustifyContent::SpaceEvenly,
-    }
-}
diff --git a/native/src/user_interface.rs b/native/src/user_interface.rs
index 0760dd7e..7c166094 100644
--- a/native/src/user_interface.rs
+++ b/native/src/user_interface.rs
@@ -1,7 +1,6 @@
-use crate::{input::mouse, Element, Event, Layout, Point};
+use crate::{input::mouse, layout, Element, Event, Layout, Point, Rectangle};
 
 use std::hash::Hasher;
-use stretch::{geometry, result};
 
 /// A set of interactive graphical elements with a specific [`Layout`].
 ///
@@ -15,7 +14,7 @@ use stretch::{geometry, result};
 pub struct UserInterface<'a, Message, Renderer> {
     hash: u64,
     root: Element<'a, Message, Renderer>,
-    layout: result::Layout,
+    layout: Layout,
     cursor_position: Point,
 }
 
@@ -110,7 +109,7 @@ where
         let layout = if hash == cache.hash {
             cache.layout
         } else {
-            root.compute_layout(renderer)
+            root.layout(renderer, &layout::Limits::NONE)
         };
 
         UserInterface {
@@ -210,7 +209,7 @@ where
 
             self.root.widget.on_event(
                 event,
-                Layout::new(&self.layout),
+                &self.layout,
                 self.cursor_position,
                 &mut messages,
                 renderer,
@@ -299,11 +298,9 @@ where
     /// }
     /// ```
     pub fn draw(&self, renderer: &mut Renderer) -> Renderer::Output {
-        self.root.widget.draw(
-            renderer,
-            Layout::new(&self.layout),
-            self.cursor_position,
-        )
+        self.root
+            .widget
+            .draw(renderer, &self.layout, self.cursor_position)
     }
 
     /// Extract the [`Cache`] of the [`UserInterface`], consuming it in the
@@ -326,7 +323,7 @@ where
 #[derive(Debug, Clone)]
 pub struct Cache {
     hash: u64,
-    layout: result::Layout,
+    layout: Layout,
     cursor_position: Point,
 }
 
@@ -339,16 +336,14 @@ impl Cache {
     /// [`Cache`]: struct.Cache.html
     /// [`UserInterface`]: struct.UserInterface.html
     pub fn new() -> Cache {
-        use crate::{Node, Style};
-
-        let empty_node = Node::new(Style::default());
-
         Cache {
             hash: 0,
-            layout: empty_node
-                .0
-                .compute_layout(geometry::Size::undefined())
-                .unwrap(),
+            layout: Layout::new(Rectangle {
+                x: 0.0,
+                y: 0.0,
+                width: 0.0,
+                height: 0.0,
+            }),
             cursor_position: Point::new(-1.0, -1.0),
         }
     }
diff --git a/native/src/widget.rs b/native/src/widget.rs
index 01f5c92e..0dfd5fd7 100644
--- a/native/src/widget.rs
+++ b/native/src/widget.rs
@@ -52,7 +52,7 @@ pub use text::Text;
 #[doc(no_inline)]
 pub use text_input::TextInput;
 
-use crate::{Event, Hasher, Layout, Node, Point};
+use crate::{layout, Event, Hasher, Layout, Point};
 
 /// A component that displays information and allows interaction.
 ///
@@ -73,7 +73,7 @@ where
     /// [`Node`]: ../struct.Node.html
     /// [`Widget`]: trait.Widget.html
     /// [`Layout`]: ../struct.Layout.html
-    fn node(&self, renderer: &Renderer) -> Node;
+    fn layout(&self, renderer: &Renderer, limits: &layout::Limits) -> Layout;
 
     /// Draws the [`Widget`] using the associated `Renderer`.
     ///
@@ -81,7 +81,7 @@ where
     fn draw(
         &self,
         renderer: &mut Renderer,
-        layout: Layout<'_>,
+        layout: &Layout,
         cursor_position: Point,
     ) -> Renderer::Output;
 
@@ -117,7 +117,7 @@ where
     fn on_event(
         &mut self,
         _event: Event,
-        _layout: Layout<'_>,
+        _layout: &Layout,
         _cursor_position: Point,
         _messages: &mut Vec<Message>,
         _renderer: &Renderer,
diff --git a/native/src/widget/button.rs b/native/src/widget/button.rs
index 31dd6fcc..882d4a6c 100644
--- a/native/src/widget/button.rs
+++ b/native/src/widget/button.rs
@@ -7,7 +7,7 @@
 //! [`Class`]: enum.Class.html
 
 use crate::input::{mouse, ButtonState};
-use crate::{Element, Event, Hasher, Layout, Node, Point, Widget};
+use crate::{layout, Element, Event, Hasher, Layout, Point, Widget};
 use std::hash::Hash;
 
 pub use iced_core::button::State;
@@ -21,14 +21,14 @@ where
     Renderer: self::Renderer,
     Message: Clone + std::fmt::Debug,
 {
-    fn node(&self, renderer: &Renderer) -> Node {
-        renderer.node(&self)
+    fn layout(&self, renderer: &Renderer, limits: &layout::Limits) -> Layout {
+        renderer.layout(&self, limits)
     }
 
     fn on_event(
         &mut self,
         event: Event,
-        layout: Layout<'_>,
+        layout: &Layout,
         cursor_position: Point,
         messages: &mut Vec<Message>,
         _renderer: &Renderer,
@@ -66,7 +66,7 @@ where
     fn draw(
         &self,
         renderer: &mut Renderer,
-        layout: Layout<'_>,
+        layout: &Layout,
         cursor_position: Point,
     ) -> Renderer::Output {
         renderer.draw(&self, layout, cursor_position)
@@ -91,7 +91,11 @@ pub trait Renderer: crate::Renderer + Sized {
     ///
     /// [`Node`]: ../../struct.Node.html
     /// [`Button`]: struct.Button.html
-    fn node<Message>(&self, button: &Button<'_, Message, Self>) -> Node;
+    fn layout<Message>(
+        &self,
+        button: &Button<'_, Message, Self>,
+        limits: &layout::Limits,
+    ) -> Layout;
 
     /// Draws a [`Button`].
     ///
@@ -99,7 +103,7 @@ pub trait Renderer: crate::Renderer + Sized {
     fn draw<Message>(
         &mut self,
         button: &Button<'_, Message, Self>,
-        layout: Layout<'_>,
+        layout: &Layout,
         cursor_position: Point,
     ) -> Self::Output;
 }
diff --git a/native/src/widget/checkbox.rs b/native/src/widget/checkbox.rs
index b8053238..12a6a728 100644
--- a/native/src/widget/checkbox.rs
+++ b/native/src/widget/checkbox.rs
@@ -2,7 +2,7 @@
 use std::hash::Hash;
 
 use crate::input::{mouse, ButtonState};
-use crate::{Element, Event, Hasher, Layout, Node, Point, Widget};
+use crate::{layout, Element, Event, Hasher, Layout, Point, Widget};
 
 pub use iced_core::Checkbox;
 
@@ -10,14 +10,14 @@ impl<Message, Renderer> Widget<Message, Renderer> for Checkbox<Message>
 where
     Renderer: self::Renderer,
 {
-    fn node(&self, renderer: &Renderer) -> Node {
-        renderer.node(&self)
+    fn layout(&self, renderer: &Renderer, limits: &layout::Limits) -> Layout {
+        renderer.layout(&self, limits)
     }
 
     fn on_event(
         &mut self,
         event: Event,
-        layout: Layout<'_>,
+        layout: &Layout,
         cursor_position: Point,
         messages: &mut Vec<Message>,
         _renderer: &Renderer,
@@ -40,7 +40,7 @@ where
     fn draw(
         &self,
         renderer: &mut Renderer,
-        layout: Layout<'_>,
+        layout: &Layout,
         cursor_position: Point,
     ) -> Renderer::Output {
         renderer.draw(&self, layout, cursor_position)
@@ -63,7 +63,11 @@ pub trait Renderer: crate::Renderer {
     ///
     /// [`Node`]: ../../struct.Node.html
     /// [`Checkbox`]: struct.Checkbox.html
-    fn node<Message>(&self, checkbox: &Checkbox<Message>) -> Node;
+    fn layout<Message>(
+        &self,
+        checkbox: &Checkbox<Message>,
+        limits: &layout::Limits,
+    ) -> Layout;
 
     /// Draws a [`Checkbox`].
     ///
@@ -77,7 +81,7 @@ pub trait Renderer: crate::Renderer {
     fn draw<Message>(
         &mut self,
         checkbox: &Checkbox<Message>,
-        layout: Layout<'_>,
+        layout: &Layout,
         cursor_position: Point,
     ) -> Self::Output;
 }
diff --git a/native/src/widget/column.rs b/native/src/widget/column.rs
index 086d05ef..d0446ec9 100644
--- a/native/src/widget/column.rs
+++ b/native/src/widget/column.rs
@@ -1,6 +1,6 @@
 use std::hash::Hash;
 
-use crate::{Element, Event, Hasher, Layout, Node, Point, Style, Widget};
+use crate::{layout, Element, Event, Hasher, Layout, Point, Rectangle, Widget};
 
 /// A container that distributes its contents vertically.
 pub type Column<'a, Message, Renderer> =
@@ -11,48 +11,20 @@ impl<'a, Message, Renderer> Widget<Message, Renderer>
 where
     Renderer: self::Renderer,
 {
-    fn node(&self, renderer: &Renderer) -> Node {
-        let mut children: Vec<Node> = self
-            .children
-            .iter()
-            .map(|child| {
-                let mut node = child.widget.node(renderer);
-
-                let mut style = node.0.style();
-                style.margin.bottom =
-                    stretch::style::Dimension::Points(f32::from(self.spacing));
-
-                node.0.set_style(style);
-                node
-            })
-            .collect();
-
-        if let Some(node) = children.last_mut() {
-            let mut style = node.0.style();
-            style.margin.bottom = stretch::style::Dimension::Undefined;
-
-            node.0.set_style(style);
-        }
-
-        let mut style = Style::default()
-            .width(self.width)
-            .height(self.height)
-            .max_width(self.max_width)
-            .max_height(self.max_height)
-            .padding(self.padding)
-            .align_self(self.align_self)
-            .align_items(self.align_items)
-            .justify_content(self.justify_content);
-
-        style.0.flex_direction = stretch::style::FlexDirection::Column;
-
-        Node::with_children(style, children)
+    fn layout(&self, renderer: &Renderer, limits: &layout::Limits) -> Layout {
+        // TODO
+        Layout::new(Rectangle {
+            x: 0.0,
+            y: 0.0,
+            width: 0.0,
+            height: 0.0,
+        })
     }
 
     fn on_event(
         &mut self,
         event: Event,
-        layout: Layout<'_>,
+        layout: &Layout,
         cursor_position: Point,
         messages: &mut Vec<Message>,
         renderer: &Renderer,
@@ -73,7 +45,7 @@ where
     fn draw(
         &self,
         renderer: &mut Renderer,
-        layout: Layout<'_>,
+        layout: &Layout,
         cursor_position: Point,
     ) -> Renderer::Output {
         renderer.draw(&self, layout, cursor_position)
@@ -100,7 +72,7 @@ pub trait Renderer: crate::Renderer + Sized {
     fn draw<Message>(
         &mut self,
         row: &Column<'_, Message, Self>,
-        layout: Layout<'_>,
+        layout: &Layout,
         cursor_position: Point,
     ) -> Self::Output;
 }
diff --git a/native/src/widget/image.rs b/native/src/widget/image.rs
index 6255a7b5..b503f95c 100644
--- a/native/src/widget/image.rs
+++ b/native/src/widget/image.rs
@@ -1,6 +1,6 @@
 //! Display images in your user interface.
 
-use crate::{Element, Hasher, Layout, Node, Point, Widget};
+use crate::{layout, Element, Hasher, Layout, Point, Widget};
 
 use std::hash::Hash;
 
@@ -10,14 +10,14 @@ impl<Message, Renderer> Widget<Message, Renderer> for Image
 where
     Renderer: self::Renderer,
 {
-    fn node(&self, renderer: &Renderer) -> Node {
-        renderer.node(&self)
+    fn layout(&self, renderer: &Renderer, limits: &layout::Limits) -> Layout {
+        renderer.layout(&self, limits)
     }
 
     fn draw(
         &self,
         renderer: &mut Renderer,
-        layout: Layout<'_>,
+        layout: &Layout,
         _cursor_position: Point,
     ) -> Renderer::Output {
         renderer.draw(&self, layout)
@@ -44,12 +44,12 @@ pub trait Renderer: crate::Renderer {
     ///
     /// [`Node`]: ../../struct.Node.html
     /// [`Image`]: struct.Image.html
-    fn node(&self, image: &Image) -> Node;
+    fn layout(&self, image: &Image, limits: &layout::Limits) -> Layout;
 
     /// Draws an [`Image`].
     ///
     /// [`Image`]: struct.Image.html
-    fn draw(&mut self, image: &Image, layout: Layout<'_>) -> Self::Output;
+    fn draw(&mut self, image: &Image, layout: &Layout) -> Self::Output;
 }
 
 impl<'a, Message, Renderer> From<Image> for Element<'a, Message, Renderer>
diff --git a/native/src/widget/radio.rs b/native/src/widget/radio.rs
index 626e6ffc..86d507da 100644
--- a/native/src/widget/radio.rs
+++ b/native/src/widget/radio.rs
@@ -1,6 +1,6 @@
 //! Create choices using radio buttons.
 use crate::input::{mouse, ButtonState};
-use crate::{Element, Event, Hasher, Layout, Node, Point, Widget};
+use crate::{layout, Element, Event, Hasher, Layout, Point, Widget};
 
 use std::hash::Hash;
 
@@ -11,14 +11,14 @@ where
     Renderer: self::Renderer,
     Message: Clone + std::fmt::Debug,
 {
-    fn node(&self, renderer: &Renderer) -> Node {
-        renderer.node(&self)
+    fn layout(&self, renderer: &Renderer, limits: &layout::Limits) -> Layout {
+        renderer.layout(&self, limits)
     }
 
     fn on_event(
         &mut self,
         event: Event,
-        layout: Layout<'_>,
+        layout: &Layout,
         cursor_position: Point,
         messages: &mut Vec<Message>,
         _renderer: &Renderer,
@@ -39,7 +39,7 @@ where
     fn draw(
         &self,
         renderer: &mut Renderer,
-        layout: Layout<'_>,
+        layout: &Layout,
         cursor_position: Point,
     ) -> Renderer::Output {
         renderer.draw(&self, layout, cursor_position)
@@ -62,7 +62,11 @@ pub trait Renderer: crate::Renderer {
     ///
     /// [`Node`]: ../../struct.Node.html
     /// [`Radio`]: struct.Radio.html
-    fn node<Message>(&self, radio: &Radio<Message>) -> Node;
+    fn layout<Message>(
+        &self,
+        radio: &Radio<Message>,
+        limits: &layout::Limits,
+    ) -> Layout;
 
     /// Draws a [`Radio`] button.
     ///
@@ -76,7 +80,7 @@ pub trait Renderer: crate::Renderer {
     fn draw<Message>(
         &mut self,
         radio: &Radio<Message>,
-        layout: Layout<'_>,
+        layout: &Layout,
         cursor_position: Point,
     ) -> Self::Output;
 }
diff --git a/native/src/widget/row.rs b/native/src/widget/row.rs
index 7dbfb92a..ca1cda23 100644
--- a/native/src/widget/row.rs
+++ b/native/src/widget/row.rs
@@ -1,6 +1,6 @@
 use std::hash::Hash;
 
-use crate::{Element, Event, Hasher, Layout, Node, Point, Style, Widget};
+use crate::{layout, Element, Event, Hasher, Layout, Point, Rectangle, Widget};
 
 /// A container that distributes its contents horizontally.
 pub type Row<'a, Message, Renderer> =
@@ -11,48 +11,20 @@ impl<'a, Message, Renderer> Widget<Message, Renderer>
 where
     Renderer: self::Renderer,
 {
-    fn node(&self, renderer: &Renderer) -> Node {
-        let mut children: Vec<Node> = self
-            .children
-            .iter()
-            .map(|child| {
-                let mut node = child.widget.node(renderer);
-
-                let mut style = node.0.style();
-                style.margin.end =
-                    stretch::style::Dimension::Points(f32::from(self.spacing));
-
-                node.0.set_style(style);
-                node
-            })
-            .collect();
-
-        if let Some(node) = children.last_mut() {
-            let mut style = node.0.style();
-            style.margin.end = stretch::style::Dimension::Undefined;
-
-            node.0.set_style(style);
-        }
-
-        let mut style = Style::default()
-            .width(self.width)
-            .height(self.height)
-            .max_width(self.max_width)
-            .max_height(self.max_height)
-            .padding(self.padding)
-            .align_self(self.align_self)
-            .align_items(self.align_items)
-            .justify_content(self.justify_content);
-
-        style.0.flex_direction = stretch::style::FlexDirection::Row;
-
-        Node::with_children(style, children)
+    fn layout(&self, renderer: &Renderer, limits: &layout::Limits) -> Layout {
+        // TODO
+        Layout::new(Rectangle {
+            x: 0.0,
+            y: 0.0,
+            width: 0.0,
+            height: 0.0,
+        })
     }
 
     fn on_event(
         &mut self,
         event: Event,
-        layout: Layout<'_>,
+        layout: &Layout,
         cursor_position: Point,
         messages: &mut Vec<Message>,
         renderer: &Renderer,
@@ -73,7 +45,7 @@ where
     fn draw(
         &self,
         renderer: &mut Renderer,
-        layout: Layout<'_>,
+        layout: &Layout,
         cursor_position: Point,
     ) -> Renderer::Output {
         renderer.draw(&self, layout, cursor_position)
@@ -101,7 +73,7 @@ pub trait Renderer: crate::Renderer + Sized {
     fn draw<Message>(
         &mut self,
         row: &Row<'_, Message, Self>,
-        layout: Layout<'_>,
+        layout: &Layout,
         cursor_position: Point,
     ) -> Self::Output;
 }
diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs
index de4c749c..a5eb2f01 100644
--- a/native/src/widget/scrollable.rs
+++ b/native/src/widget/scrollable.rs
@@ -1,7 +1,7 @@
 use crate::{
     column,
     input::{mouse, ButtonState},
-    Element, Event, Hasher, Layout, Node, Point, Rectangle, Style, Widget,
+    layout, Element, Event, Hasher, Layout, Point, Rectangle, Widget,
 };
 
 pub use iced_core::scrollable::State;
@@ -19,32 +19,15 @@ impl<'a, Message, Renderer> Widget<Message, Renderer>
 where
     Renderer: self::Renderer + column::Renderer,
 {
-    fn node(&self, renderer: &Renderer) -> Node {
-        let mut content = self.content.node(renderer);
-
-        {
-            let mut style = content.0.style();
-            style.flex_shrink = 0.0;
-
-            content.0.set_style(style);
-        }
-
-        let mut style = Style::default()
-            .width(self.content.width)
-            .max_width(self.content.max_width)
-            .height(self.height)
-            .max_height(self.max_height)
-            .align_self(self.align_self);
-
-        style.0.flex_direction = stretch::style::FlexDirection::Column;
-
-        Node::with_children(style, vec![content])
+    fn layout(&self, renderer: &Renderer, limits: &layout::Limits) -> Layout {
+        // TODO
+        self.content.layout(renderer, limits)
     }
 
     fn on_event(
         &mut self,
         event: Event,
-        layout: Layout<'_>,
+        layout: &Layout,
         cursor_position: Point,
         messages: &mut Vec<Message>,
         renderer: &Renderer,
@@ -147,7 +130,7 @@ where
     fn draw(
         &self,
         renderer: &mut Renderer,
-        layout: Layout<'_>,
+        layout: &Layout,
         cursor_position: Point,
     ) -> Renderer::Output {
         let bounds = layout.bounds();
@@ -185,7 +168,7 @@ pub trait Renderer: crate::Renderer + Sized {
         &mut self,
         scrollable: &Scrollable<'_, Message, Self>,
         bounds: Rectangle,
-        content_layout: Layout<'_>,
+        content_layout: &Layout,
         cursor_position: Point,
     ) -> Self::Output;
 }
diff --git a/native/src/widget/slider.rs b/native/src/widget/slider.rs
index be2b9b22..be4ed564 100644
--- a/native/src/widget/slider.rs
+++ b/native/src/widget/slider.rs
@@ -7,7 +7,7 @@
 use std::hash::Hash;
 
 use crate::input::{mouse, ButtonState};
-use crate::{Element, Event, Hasher, Layout, Node, Point, Widget};
+use crate::{layout, Element, Event, Hasher, Layout, Point, Widget};
 
 pub use iced_core::slider::*;
 
@@ -15,14 +15,14 @@ impl<'a, Message, Renderer> Widget<Message, Renderer> for Slider<'a, Message>
 where
     Renderer: self::Renderer,
 {
-    fn node(&self, renderer: &Renderer) -> Node {
-        renderer.node(&self)
+    fn layout(&self, renderer: &Renderer, limits: &layout::Limits) -> Layout {
+        renderer.layout(&self, limits)
     }
 
     fn on_event(
         &mut self,
         event: Event,
-        layout: Layout<'_>,
+        layout: &Layout,
         cursor_position: Point,
         messages: &mut Vec<Message>,
         _renderer: &Renderer,
@@ -70,7 +70,7 @@ where
     fn draw(
         &self,
         renderer: &mut Renderer,
-        layout: Layout<'_>,
+        layout: &Layout,
         cursor_position: Point,
     ) -> Renderer::Output {
         renderer.draw(&self, layout, cursor_position)
@@ -93,7 +93,11 @@ pub trait Renderer: crate::Renderer {
     ///
     /// [`Node`]: ../../struct.Node.html
     /// [`Radio`]: struct.Radio.html
-    fn node<Message>(&self, slider: &Slider<'_, Message>) -> Node;
+    fn layout<Message>(
+        &self,
+        slider: &Slider<'_, Message>,
+        limits: &layout::Limits,
+    ) -> Layout;
 
     /// Draws a [`Slider`].
     ///
@@ -110,7 +114,7 @@ pub trait Renderer: crate::Renderer {
     fn draw<Message>(
         &mut self,
         slider: &Slider<'_, Message>,
-        layout: Layout<'_>,
+        layout: &Layout,
         cursor_position: Point,
     ) -> Self::Output;
 }
diff --git a/native/src/widget/text.rs b/native/src/widget/text.rs
index e389e1d9..da8563a4 100644
--- a/native/src/widget/text.rs
+++ b/native/src/widget/text.rs
@@ -1,5 +1,5 @@
 //! Write some text for your users to read.
-use crate::{Element, Hasher, Layout, Node, Point, Widget};
+use crate::{layout, Element, Hasher, Layout, Point, Widget};
 
 use std::hash::Hash;
 
@@ -9,14 +9,14 @@ impl<Message, Renderer> Widget<Message, Renderer> for Text
 where
     Renderer: self::Renderer,
 {
-    fn node(&self, renderer: &Renderer) -> Node {
-        renderer.node(&self)
+    fn layout(&self, renderer: &Renderer, limits: &layout::Limits) -> Layout {
+        renderer.layout(&self, limits)
     }
 
     fn draw(
         &self,
         renderer: &mut Renderer,
-        layout: Layout<'_>,
+        layout: &Layout,
         _cursor_position: Point,
     ) -> Renderer::Output {
         renderer.draw(&self, layout)
@@ -49,7 +49,7 @@ pub trait Renderer: crate::Renderer {
     /// [`Style`]: ../../struct.Style.html
     /// [`Text`]: struct.Text.html
     /// [`Node::with_measure`]: ../../struct.Node.html#method.with_measure
-    fn node(&self, text: &Text) -> Node;
+    fn layout(&self, text: &Text, limits: &layout::Limits) -> Layout;
 
     /// Draws a [`Text`] fragment.
     ///
@@ -64,7 +64,7 @@ pub trait Renderer: crate::Renderer {
     /// [`Text`]: struct.Text.html
     /// [`HorizontalAlignment`]: enum.HorizontalAlignment.html
     /// [`VerticalAlignment`]: enum.VerticalAlignment.html
-    fn draw(&mut self, text: &Text, layout: Layout<'_>) -> Self::Output;
+    fn draw(&mut self, text: &Text, layout: &Layout) -> Self::Output;
 }
 
 impl<'a, Message, Renderer> From<Text> for Element<'a, Message, Renderer>
diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs
index d9837b61..ca72801d 100644
--- a/native/src/widget/text_input.rs
+++ b/native/src/widget/text_input.rs
@@ -1,7 +1,6 @@
 use crate::{
     input::{keyboard, mouse, ButtonState},
-    Element, Event, Hasher, Layout, Length, Node, Point, Rectangle, Style,
-    Widget,
+    layout, Element, Event, Hasher, Layout, Point, Rectangle, Widget,
 };
 
 pub use iced_core::{text_input::State, TextInput};
@@ -11,25 +10,20 @@ where
     Renderer: self::Renderer,
     Message: Clone + std::fmt::Debug,
 {
-    fn node(&self, renderer: &Renderer) -> Node {
-        let text_bounds =
-            Node::new(Style::default().width(Length::Fill).height(
-                Length::Units(self.size.unwrap_or(renderer.default_size())),
-            ));
-
-        Node::with_children(
-            Style::default()
-                .width(self.width)
-                .max_width(self.width)
-                .padding(self.padding),
-            vec![text_bounds],
-        )
+    fn layout(&self, renderer: &Renderer, limits: &layout::Limits) -> Layout {
+        // TODO
+        Layout::new(Rectangle {
+            x: 0.0,
+            y: 0.0,
+            width: 0.0,
+            height: 0.0,
+        })
     }
 
     fn on_event(
         &mut self,
         event: Event,
-        layout: Layout<'_>,
+        layout: &Layout,
         cursor_position: Point,
         messages: &mut Vec<Message>,
         _renderer: &Renderer,
@@ -101,7 +95,7 @@ where
     fn draw(
         &self,
         renderer: &mut Renderer,
-        layout: Layout<'_>,
+        layout: &Layout,
         cursor_position: Point,
     ) -> Renderer::Output {
         let bounds = layout.bounds();