Replace width and height with Widget::size

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 {
+    fn size(&self) -> Size<Length> {
-        self.widget.width()
+        self.widget.size()
-    }
-
-    fn height(&self) -> Length {
-        self.widget.height()
     }
 
     fn layout(
@@ -466,12 +462,8 @@ impl<'a, Message, Renderer> Widget<Message, Renderer>
 where
     Renderer: crate::Renderer,
 {
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        self.element.widget.width()
+        self.element.widget.size()
-    }
-
-    fn height(&self) -> Length {
-        self.element.widget.height()
     }
 
     fn tag(&self) -> tree::Tag {

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(
+        let (fill_main_factor, fill_cross_factor) = {
-            child.as_widget().width().fill_factor(),
+            let size = child.as_widget().size();
-            child.as_widget().height().fill_factor(),
+
-        );
+            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(
+        let (fill_main_factor, fill_cross_factor) = {
-            child.as_widget().width().fill_factor(),
+            let size = child.as_widget().size();
-            child.as_widget().height().fill_factor(),
+
-        );
+            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(
+        let (fill_main_factor, fill_cross_factor) = {
-            child.as_widget().width().fill_factor(),
+            let size = child.as_widget().size();
-            child.as_widget().height().fill_factor(),
+
-        );
+            axis.pack(size.width.fill_factor(), size.height.fill_factor())
+        };
 
         if fill_main_factor != 0 {
             let max_main = if fill_main_factor == 0 {

core/src/widget.rs

@@ -43,18 +43,15 @@ pub trait Widget<Message, Renderer>
 where
     Renderer: crate::Renderer,
 {
-    /// Returns the width of the [`Widget`].
+    /// Returns the [`Size`] of the [`Widget`] in lengths.
-    fn width(&self) -> Length;
+    fn size(&self) -> Size<Length>;
-
-    /// Returns the height of the [`Widget`].
-    fn height(&self) -> 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`].

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 {
+    fn size(&self) -> Size<Length> {
-        self.width
+        Size {
-    }
+            width: self.width,
-
+            height: self.height,
-    fn height(&self) -> Length {
+        }
-        self.height
     }
 
     fn layout(

examples/custom_quad/src/main.rs

@@ -26,12 +26,11 @@ mod quad {
     where
         Renderer: renderer::Renderer,
     {
-        fn width(&self) -> Length {
+        fn size(&self) -> Size<Length> {
-            Length::Shrink
+            Size {
-        }
+                width: Length::Shrink,
-
+                height: Length::Shrink,
-        fn height(&self) -> Length {
+            }
-            Length::Shrink
         }
 
         fn layout(

examples/custom_widget/src/main.rs

@@ -33,12 +33,11 @@ mod circle {
     where
         Renderer: renderer::Renderer,
     {
-        fn width(&self) -> Length {
+        fn size(&self) -> Size<Length> {
-            Length::Shrink
+            Size {
-        }
+                width: Length::Shrink,
-
+                height: Length::Shrink,
-        fn height(&self) -> Length {
+            }
-            Length::Shrink
         }
 
         fn layout(

examples/geometry/src/main.rs

@@ -16,12 +16,11 @@ mod rainbow {
     }
 
     impl<Message> Widget<Message, Renderer> for Rainbow {
-        fn width(&self) -> Length {
+        fn size(&self) -> Size<Length> {
-            Length::Fill
+            Size {
-        }
+                width: Length::Fill,
-
+                height: Length::Shrink,
-        fn height(&self) -> Length {
+            }
-            Length::Shrink
         }
 
         fn layout(

examples/loading_spinners/src/circular.rs

@@ -244,12 +244,11 @@ where
         tree::State::new(State::default())
     }
 
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        Length::Fixed(self.size)
+        Size {
-    }
+            width: Length::Fixed(self.size),
-
+            height: Length::Fixed(self.size),
-    fn height(&self) -> Length {
+        }
-        Length::Fixed(self.size)
     }
 
     fn layout(

examples/loading_spinners/src/linear.rs

@@ -165,12 +165,11 @@ where
         tree::State::new(State::default())
     }
 
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        self.width
+        Size {
-    }
+            width: self.width,
-
+            height: self.height,
-    fn height(&self) -> Length {
+        }
-        self.height
     }
 
     fn layout(

examples/modal/src/main.rs

@@ -281,12 +281,8 @@ mod modal {
             tree.diff_children(&[&self.base, &self.modal]);
         }
 
-        fn width(&self) -> Length {
+        fn size(&self) -> Size<Length> {
-            self.base.as_widget().width()
+            self.base.as_widget().size()
-        }
-
-        fn height(&self) -> Length {
-            self.base.as_widget().height()
         }
 
         fn layout(

examples/toast/src/main.rs

@@ -313,12 +313,8 @@ mod toast {
     }
 
     impl<'a, Message> Widget<Message, Renderer> for Manager<'a, Message> {
-        fn width(&self) -> Length {
+        fn size(&self) -> Size<Length> {
-            self.content.as_widget().width()
+            self.content.as_widget().size()
-        }
-
-        fn height(&self) -> Length {
-            self.content.as_widget().height()
         }
 
         fn layout(

widget/src/button.rs

@@ -11,7 +11,7 @@ use crate::core::widget::tree::{self, Tree};
 use crate::core::widget::Operation;
 use crate::core::{
     Background, Clipboard, Color, Element, Layout, Length, Padding, Point,
-    Rectangle, Shell, Vector, Widget,
+    Rectangle, Shell, Size, Vector, Widget,
 };
 
 pub use iced_style::button::{Appearance, StyleSheet};
@@ -149,12 +149,11 @@ where
         tree.diff_children(std::slice::from_ref(&self.content));
     }
 
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        self.width
+        Size {
-    }
+            width: self.width,
-
+            height: self.height,
-    fn height(&self) -> Length {
+        }
-        self.height
     }
 
     fn layout(

widget/src/canvas.rs

@@ -14,8 +14,9 @@ use crate::core::layout::{self, Layout};
 use crate::core::mouse;
 use crate::core::renderer;
 use crate::core::widget::tree::{self, Tree};
-use crate::core::{Clipboard, Element, Shell, Widget};
+use crate::core::{
-use crate::core::{Length, Rectangle, Size, Vector};
+    Clipboard, Element, Length, Rectangle, Shell, Size, Vector, Widget,
+};
 use crate::graphics::geometry;
 
 use std::marker::PhantomData;
@@ -119,12 +120,11 @@ where
         tree::State::new(P::State::default())
     }
 
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        self.width
+        Size {
-    }
+            width: self.width,
-
+            height: self.height,
-    fn height(&self) -> Length {
+        }
-        self.height
     }
 
     fn layout(

widget/src/checkbox.rs

@@ -174,12 +174,11 @@ where
         tree::State::new(widget::text::State::<Renderer::Paragraph>::default())
     }
 
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        self.width
+        Size {
-    }
+            width: self.width,
-
+            height: Length::Shrink,
-    fn height(&self) -> Length {
+        }
-        Length::Shrink
     }
 
     fn layout(

widget/src/column.rs

@@ -7,7 +7,7 @@ use crate::core::renderer;
 use crate::core::widget::{Operation, Tree};
 use crate::core::{
     Alignment, Clipboard, Element, Layout, Length, Padding, Pixels, Rectangle,
-    Shell, Widget,
+    Shell, Size, Widget,
 };
 
 /// A container that distributes its contents vertically.
@@ -129,12 +129,11 @@ where
         tree.diff_children(&self.children);
     }
 
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        self.width
+        Size {
-    }
+            width: self.width,
-
+            height: self.height,
-    fn height(&self) -> Length {
+        }
-        self.height
     }
 
     fn layout(

widget/src/combo_box.rs

@@ -8,7 +8,9 @@ use crate::core::renderer;
 use crate::core::text;
 use crate::core::time::Instant;
 use crate::core::widget::{self, Widget};
-use crate::core::{Clipboard, Element, Length, Padding, Rectangle, Shell};
+use crate::core::{
+    Clipboard, Element, Length, Padding, Rectangle, Shell, Size,
+};
 use crate::overlay::menu;
 use crate::text::LineHeight;
 use crate::{container, scrollable, text_input, TextInput};
@@ -297,12 +299,8 @@ where
         + scrollable::StyleSheet
         + menu::StyleSheet,
 {
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        Widget::<TextInputEvent, Renderer>::width(&self.text_input)
+        Widget::<TextInputEvent, Renderer>::size(&self.text_input)
-    }
-
-    fn height(&self) -> Length {
-        Widget::<TextInputEvent, Renderer>::height(&self.text_input)
     }
 
     fn layout(

widget/src/container.rs

@@ -163,12 +163,11 @@ where
         self.content.as_widget().diff(tree);
     }
 
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        self.width
+        Size {
-    }
+            width: self.width,
-
+            height: self.height,
-    fn height(&self) -> Length {
+        }
-        self.height
     }
 
     fn layout(

widget/src/image.rs

@@ -164,12 +164,11 @@ where
     Renderer: image::Renderer<Handle = Handle>,
     Handle: Clone + Hash,
 {
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        self.width
+        Size {
-    }
+            width: self.width,
-
+            height: self.height,
-    fn height(&self) -> Length {
+        }
-        self.height
     }
 
     fn layout(

widget/src/image/viewer.rs

@@ -97,12 +97,11 @@ where
         tree::State::new(State::new())
     }
 
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        self.width
+        Size {
-    }
+            width: self.width,
-
+            height: self.height,
-    fn height(&self) -> Length {
+        }
-        self.height
     }
 
     fn layout(

widget/src/keyed/column.rs

@@ -8,7 +8,7 @@ use crate::core::widget::tree::{self, Tree};
 use crate::core::widget::Operation;
 use crate::core::{
     Alignment, Clipboard, Element, Layout, Length, Padding, Pixels, Rectangle,
-    Shell, Widget,
+    Shell, Size, Widget,
 };
 
 /// A container that distributes its contents vertically.
@@ -173,12 +173,11 @@ where
         }
     }
 
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        self.width
+        Size {
-    }
+            width: self.width,
-
+            height: self.height,
-    fn height(&self) -> Length {
+        }
-        self.height
     }
 
     fn layout(

widget/src/lazy.rs

@@ -142,12 +142,8 @@ where
         }
     }
 
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        self.with_element(|element| element.as_widget().width())
+        self.with_element(|element| element.as_widget().size())
-    }
-
-    fn height(&self) -> Length {
-        self.with_element(|element| element.as_widget().height())
     }
 
     fn size_hint(&self) -> Size<Length> {

widget/src/lazy/component.rs

@@ -244,12 +244,8 @@ where
         self.rebuild_element_if_necessary();
     }
 
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        self.with_element(|element| element.as_widget().width())
+        self.with_element(|element| element.as_widget().size())
-    }
-
-    fn height(&self) -> Length {
-        self.with_element(|element| element.as_widget().height())
     }
 
     fn size_hint(&self) -> Size<Length> {

widget/src/lazy/responsive.rs

@@ -135,12 +135,11 @@ where
         })
     }
 
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        Length::Fill
+        Size {
-    }
+            width: Length::Fill,
-
+            height: Length::Fill,
-    fn height(&self) -> Length {
+        }
-        Length::Fill
     }
 
     fn layout(

widget/src/mouse_area.rs

@@ -8,7 +8,7 @@ use crate::core::renderer;
 use crate::core::touch;
 use crate::core::widget::{tree, Operation, Tree};
 use crate::core::{
-    Clipboard, Element, Layout, Length, Rectangle, Shell, Widget,
+    Clipboard, Element, Layout, Length, Rectangle, Shell, Size, Widget,
 };
 
 /// Emit messages on mouse events.
@@ -110,12 +110,8 @@ where
         tree.diff_children(std::slice::from_ref(&self.content));
     }
 
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        self.content.as_widget().width()
+        self.content.as_widget().size()
-    }
-
-    fn height(&self) -> Length {
-        self.content.as_widget().height()
     }
 
     fn layout(

widget/src/overlay/menu.rs

@@ -342,12 +342,11 @@ where
     Renderer: text::Renderer,
     Renderer::Theme: StyleSheet,
 {
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        Length::Fill
+        Size {
-    }
+            width: Length::Fill,
-
+            height: Length::Shrink,
-    fn height(&self) -> Length {
+        }
-        Length::Shrink
     }
 
     fn layout(

widget/src/pane_grid.rs

@@ -265,12 +265,11 @@ where
         }
     }
 
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        self.width
+        Size {
-    }
+            width: self.width,
-
+            height: self.height,
-    fn height(&self) -> Length {
+        }
-        self.height
     }
 
     fn layout(

widget/src/pick_list.rs

@@ -164,12 +164,11 @@ where
         tree::State::new(State::<Renderer::Paragraph>::new())
     }
 
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        self.width
+        Size {
-    }
+            width: self.width,
-
+            height: Length::Shrink,
-    fn height(&self) -> Length {
+        }
-        Length::Shrink
     }
 
     fn layout(

widget/src/progress_bar.rs

@@ -85,12 +85,11 @@ where
     Renderer: crate::core::Renderer,
     Renderer::Theme: StyleSheet,
 {
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        self.width
+        Size {
-    }
+            width: self.width,
-
+            height: self.height.unwrap_or(Length::Fixed(Self::DEFAULT_HEIGHT)),
-    fn height(&self) -> Length {
+        }
-        self.height.unwrap_or(Length::Fixed(Self::DEFAULT_HEIGHT))
     }
 
     fn layout(

widget/src/qr_code.rs

@@ -50,12 +50,11 @@ impl<'a> QRCode<'a> {
 }
 
 impl<'a, Message, Theme> Widget<Message, Renderer<Theme>> for QRCode<'a> {
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        Length::Shrink
+        Size {
-    }
+            width: Length::Shrink,
-
+            height: Length::Shrink,
-    fn height(&self) -> Length {
+        }
-        Length::Shrink
     }
 
     fn layout(

widget/src/radio.rs

@@ -201,12 +201,11 @@ where
         tree::State::new(widget::text::State::<Renderer::Paragraph>::default())
     }
 
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        self.width
+        Size {
-    }
+            width: self.width,
-
+            height: Length::Shrink,
-    fn height(&self) -> Length {
+        }
-        Length::Shrink
     }
 
     fn layout(

widget/src/row.rs

@@ -7,7 +7,7 @@ use crate::core::renderer;
 use crate::core::widget::{Operation, Tree};
 use crate::core::{
     Alignment, Clipboard, Element, Length, Padding, Pixels, Rectangle, Shell,
-    Widget,
+    Size, Widget,
 };
 
 /// A container that distributes its contents horizontally.
@@ -123,12 +123,11 @@ where
         tree.diff_children(&self.children);
     }
 
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        self.width
+        Size {
-    }
+            width: self.width,
-
+            height: self.height,
-    fn height(&self) -> Length {
+        }
-        self.height
     }
 
     fn layout(

widget/src/rule.rs

@@ -62,12 +62,11 @@ where
     Renderer: crate::core::Renderer,
     Renderer::Theme: StyleSheet,
 {
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        self.width
+        Size {
-    }
+            width: self.width,
-
+            height: self.height,
-    fn height(&self) -> Length {
+        }
-        self.height
     }
 
     fn layout(

widget/src/scrollable.rs

@@ -220,12 +220,11 @@ where
         tree.diff_children(std::slice::from_ref(&self.content));
     }
 
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        self.width
+        Size {
-    }
+            width: self.width,
-
+            height: self.height,
-    fn height(&self) -> Length {
+        }
-        self.height
     }
 
     fn layout(

widget/src/shader.rs

@@ -70,12 +70,11 @@ where
         tree::State::new(P::State::default())
     }
 
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        self.width
+        Size {
-    }
+            width: self.width,
-
+            height: self.height,
-    fn height(&self) -> Length {
+        }
-        self.height
     }
 
     fn layout(

widget/src/slider.rs

@@ -159,12 +159,11 @@ where
         tree::State::new(State::new())
     }
 
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        self.width
+        Size {
-    }
+            width: self.width,
-
+            height: Length::Shrink,
-    fn height(&self) -> Length {
+        }
-        Length::Shrink
     }
 
     fn layout(

widget/src/space.rs

@@ -45,12 +45,11 @@ impl<Message, Renderer> Widget<Message, Renderer> for Space
 where
     Renderer: core::Renderer,
 {
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        self.width
+        Size {
-    }
+            width: self.width,
-
+            height: self.height,
-    fn height(&self) -> Length {
+        }
-        self.height
     }
 
     fn layout(

widget/src/svg.rs

@@ -96,12 +96,11 @@ where
     Renderer: svg::Renderer,
     Renderer::Theme: iced_style::svg::StyleSheet,
 {
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        self.width
+        Size {
-    }
+            width: self.width,
-
+            height: self.height,
-    fn height(&self) -> Length {
+        }
-        self.height
     }
 
     fn layout(

widget/src/text_editor.rs

@@ -9,7 +9,7 @@ use crate::core::text::highlighter::{self, Highlighter};
 use crate::core::text::{self, LineHeight};
 use crate::core::widget::{self, Widget};
 use crate::core::{
-    Clipboard, Color, Element, Length, Padding, Pixels, Rectangle, Shell,
+    Clipboard, Color, Element, Length, Padding, Pixels, Rectangle, Shell, Size,
     Vector,
 };
 
@@ -316,12 +316,11 @@ where
         })
     }
 
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        self.width
+        Size {
-    }
+            width: self.width,
-
+            height: self.height,
-    fn height(&self) -> Length {
+        }
-        self.height
     }
 
     fn layout(

widget/src/text_input.rs

@@ -283,12 +283,11 @@ where
         }
     }
 
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        self.width
+        Size {
-    }
+            width: self.width,
-
+            height: Length::Shrink,
-    fn height(&self) -> Length {
+        }
-        Length::Shrink
     }
 
     fn layout(

widget/src/toggler.rs

@@ -168,12 +168,11 @@ where
         tree::State::new(widget::text::State::<Renderer::Paragraph>::default())
     }
 
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        self.width
+        Size {
-    }
+            width: self.width,
-
+            height: Length::Shrink,
-    fn height(&self) -> Length {
+        }
-        Length::Shrink
     }
 
     fn layout(

widget/src/tooltip.rs

@@ -131,12 +131,8 @@ where
         widget::tree::Tag::of::<State>()
     }
 
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        self.content.as_widget().width()
+        self.content.as_widget().size()
-    }
-
-    fn height(&self) -> Length {
-        self.content.as_widget().height()
     }
 
     fn layout(

widget/src/vertical_slider.rs

@@ -156,12 +156,11 @@ where
         tree::State::new(State::new())
     }
 
-    fn width(&self) -> Length {
+    fn size(&self) -> Size<Length> {
-        Length::Shrink
+        Size {
-    }
+            width: Length::Shrink,
-
+            height: self.height,
-    fn height(&self) -> Length {
+        }
-        self.height
     }
 
     fn layout(