diff options
| author |  Héctor Ramón <hector@hecrj.dev> | 2024-01-12 14:41:40 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2024-01-12 14:41:40 +0100 |
| commit | 50c310fd9f692eafb2350827636ffbd6d7b6c9b9 (patch) | |
| tree | 0f1ab4182a0cce7469e01881c095e0c3988b3f9a /core/src/element.rs | |
| parent | 63e9adac56e9a4f21ec82137329d7c455fbf630b (diff) | |
| parent | 11474bdc3e1a43e6c167d7b98f22d87933dbd2b6 (diff) | |
| download | iced-50c310fd9f692eafb2350827636ffbd6d7b6c9b9.tar.gz iced-50c310fd9f692eafb2350827636ffbd6d7b6c9b9.tar.bz2 iced-50c310fd9f692eafb2350827636ffbd6d7b6c9b9.zip | |
Merge pull request #2192 from iced-rs/fix/layout-inconsistencies
Layout consistency
Diffstat (limited to 'core/src/element.rs')
| -rw-r--r-- | core/src/element.rs | 18 |
1 files changed, 5 insertions, 13 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 { |