Replace `width` and `height` with `Widget::size`

4 files changed, 31 insertions, 38 deletions

diff --git a/core/src/element.rs b/core/src/element.rs
index dea111af..8b510218 100644
--- a/core/src/element.rs
+++ b/core/src/element.rs
@@ -6,7 +6,7 @@ use crate::renderer;
 use crate::widget;
 use crate::widget::tree::{self, Tree};
 use crate::{
-    Clipboard, Color, Layout, Length, Rectangle, Shell, Vector, Widget,
+    Clipboard, Color, Layout, Length, Rectangle, Shell, Size, Vector, Widget,
 };
 
 use std::any::Any;
@@ -296,12 +296,8 @@ where
         self.widget.diff(tree);
     }
 
-    fn width(&self) -> Length {
-        self.widget.width()
-    }
-
-    fn height(&self) -> Length {
-        self.widget.height()
+    fn size(&self) -> Size<Length> {
+        self.widget.size()
     }
 
     fn layout(
@@ -466,12 +462,8 @@ impl<'a, Message, Renderer> Widget<Message, Renderer>
 where
     Renderer: crate::Renderer,
 {
-    fn width(&self) -> Length {
-        self.element.widget.width()
-    }
-
-    fn height(&self) -> Length {
-        self.element.widget.height()
+    fn size(&self) -> Size<Length> {
+        self.element.widget.size()
     }
 
     fn tag(&self) -> tree::Tag {
diff --git a/core/src/layout/flex.rs b/core/src/layout/flex.rs
index 67cc7f2a..036b31fd 100644
--- a/core/src/layout/flex.rs
+++ b/core/src/layout/flex.rs
@@ -86,10 +86,11 @@ where
     nodes.resize(items.len(), Node::default());
 
     for (i, (child, tree)) in items.iter().zip(trees.iter_mut()).enumerate() {
-        let (fill_main_factor, fill_cross_factor) = axis.pack(
-            child.as_widget().width().fill_factor(),
-            child.as_widget().height().fill_factor(),
-        );
+        let (fill_main_factor, fill_cross_factor) = {
+            let size = child.as_widget().size();
+
+            axis.pack(size.width.fill_factor(), size.height.fill_factor())
+        };
 
         if fill_main_factor == 0 {
             if fill_cross_factor == 0 {
@@ -124,10 +125,11 @@ where
     };
 
     for (i, (child, tree)) in items.iter().zip(trees.iter_mut()).enumerate() {
-        let (fill_main_factor, fill_cross_factor) = axis.pack(
-            child.as_widget().width().fill_factor(),
-            child.as_widget().height().fill_factor(),
-        );
+        let (fill_main_factor, fill_cross_factor) = {
+            let size = child.as_widget().size();
+
+            axis.pack(size.width.fill_factor(), size.height.fill_factor())
+        };
 
         if fill_main_factor == 0 && fill_cross_factor != 0 {
             let (max_width, max_height) = axis.pack(available, intrinsic_cross);
@@ -157,10 +159,11 @@ where
     };
 
     for (i, (child, tree)) in items.iter().zip(trees).enumerate() {
-        let (fill_main_factor, fill_cross_factor) = axis.pack(
-            child.as_widget().width().fill_factor(),
-            child.as_widget().height().fill_factor(),
-        );
+        let (fill_main_factor, fill_cross_factor) = {
+            let size = child.as_widget().size();
+
+            axis.pack(size.width.fill_factor(), size.height.fill_factor())
+        };
 
         if fill_main_factor != 0 {
             let max_main = if fill_main_factor == 0 {
diff --git a/core/src/widget.rs b/core/src/widget.rs
index 890b3773..7f5632ae 100644
--- a/core/src/widget.rs
+++ b/core/src/widget.rs
@@ -43,18 +43,15 @@ pub trait Widget<Message, Renderer>
 where
     Renderer: crate::Renderer,
 {
-    /// Returns the width of the [`Widget`].
-    fn width(&self) -> Length;
-
-    /// Returns the height of the [`Widget`].
-    fn height(&self) -> Length;
+    /// Returns the [`Size`] of the [`Widget`] in lengths.
+    fn size(&self) -> Size<Length>;
 
     /// Returns a [`Size`] hint for laying out the [`Widget`].
     ///
     /// This hint may be used by some widget containers to adjust their sizing strategy
     /// during construction.
     fn size_hint(&self) -> Size<Length> {
-        Size::new(self.width(), self.height())
+        self.size()
     }
 
     /// Returns the [`layout::Node`] of the [`Widget`].
diff --git a/core/src/widget/text.rs b/core/src/widget/text.rs
index e47e4178..fe3b77d3 100644
--- a/core/src/widget/text.rs
+++ b/core/src/widget/text.rs
@@ -5,7 +5,9 @@ use crate::mouse;
 use crate::renderer;
 use crate::text::{self, Paragraph};
 use crate::widget::tree::{self, Tree};
-use crate::{Color, Element, Layout, Length, Pixels, Point, Rectangle, Widget};
+use crate::{
+    Color, Element, Layout, Length, Pixels, Point, Rectangle, Size, Widget,
+};
 
 use std::borrow::Cow;
 
@@ -134,12 +136,11 @@ where
         tree::State::new(State(Renderer::Paragraph::default()))
     }
 
-    fn width(&self) -> Length {
-        self.width
-    }
-
-    fn height(&self) -> Length {
-        self.height
+    fn size(&self) -> Size<Length> {
+        Size {
+            width: self.width,
+            height: self.height,
+        }
     }
 
     fn layout(