diff options
Diffstat (limited to 'native/src/widget')
-rw-r--r-- | native/src/widget/button.rs | 10 | ||||
-rw-r--r-- | native/src/widget/checkbox.rs | 4 | ||||
-rw-r--r-- | native/src/widget/column.rs | 4 | ||||
-rw-r--r-- | native/src/widget/container.rs | 4 | ||||
-rw-r--r-- | native/src/widget/image.rs | 10 | ||||
-rw-r--r-- | native/src/widget/radio.rs | 4 | ||||
-rw-r--r-- | native/src/widget/row.rs | 4 | ||||
-rw-r--r-- | native/src/widget/scrollable.rs | 8 | ||||
-rw-r--r-- | native/src/widget/slider.rs | 4 | ||||
-rw-r--r-- | native/src/widget/text.rs | 4 | ||||
-rw-r--r-- | native/src/widget/text_input.rs | 4 |
11 files changed, 58 insertions, 2 deletions
diff --git a/native/src/widget/button.rs b/native/src/widget/button.rs index 15beaeba..248aaaf9 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::{layout, Element, Event, Hasher, Layout, Point, Widget}; +use crate::{layout, Element, Event, Hasher, Layout, Length, Point, Widget}; use std::hash::Hash; pub use iced_core::button::State; @@ -21,6 +21,14 @@ where Renderer: self::Renderer, Message: Clone + std::fmt::Debug, { + fn width(&self) -> Length { + self.width + } + + fn height(&self) -> Length { + Length::Shrink + } + fn layout( &self, renderer: &Renderer, diff --git a/native/src/widget/checkbox.rs b/native/src/widget/checkbox.rs index 3f0f8dda..4ca44e02 100644 --- a/native/src/widget/checkbox.rs +++ b/native/src/widget/checkbox.rs @@ -14,6 +14,10 @@ where Length::Fill } + fn height(&self) -> Length { + Length::Shrink + } + fn layout( &self, renderer: &Renderer, diff --git a/native/src/widget/column.rs b/native/src/widget/column.rs index 7e7156a0..38dbcdc5 100644 --- a/native/src/widget/column.rs +++ b/native/src/widget/column.rs @@ -15,6 +15,10 @@ where self.width } + fn height(&self) -> Length { + self.height + } + fn layout( &self, renderer: &Renderer, diff --git a/native/src/widget/container.rs b/native/src/widget/container.rs index fd7a5ca5..5aed3121 100644 --- a/native/src/widget/container.rs +++ b/native/src/widget/container.rs @@ -15,6 +15,10 @@ where self.width } + fn height(&self) -> Length { + self.height + } + fn layout( &self, renderer: &Renderer, diff --git a/native/src/widget/image.rs b/native/src/widget/image.rs index b2541b87..1e203077 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::{layout, Element, Hasher, Layout, Point, Widget}; +use crate::{layout, Element, Hasher, Layout, Length, Point, Widget}; use std::hash::Hash; @@ -10,6 +10,14 @@ impl<Message, Renderer> Widget<Message, Renderer> for Image where Renderer: self::Renderer, { + fn width(&self) -> Length { + self.width + } + + fn height(&self) -> Length { + self.height + } + fn layout( &self, renderer: &Renderer, diff --git a/native/src/widget/radio.rs b/native/src/widget/radio.rs index b68919e5..c3405d1f 100644 --- a/native/src/widget/radio.rs +++ b/native/src/widget/radio.rs @@ -15,6 +15,10 @@ where Length::Fill } + fn height(&self) -> Length { + Length::Shrink + } + fn layout( &self, renderer: &Renderer, diff --git a/native/src/widget/row.rs b/native/src/widget/row.rs index 132479fd..3827fd9a 100644 --- a/native/src/widget/row.rs +++ b/native/src/widget/row.rs @@ -15,6 +15,10 @@ where self.width } + fn height(&self) -> Length { + self.height + } + fn layout( &self, renderer: &Renderer, diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs index 091dac47..3877f6fe 100644 --- a/native/src/widget/scrollable.rs +++ b/native/src/widget/scrollable.rs @@ -21,6 +21,14 @@ impl<'a, Message, Renderer> Widget<Message, Renderer> where Renderer: self::Renderer + column::Renderer, { + fn width(&self) -> Length { + Length::Fill + } + + fn height(&self) -> Length { + self.height + } + fn layout( &self, renderer: &Renderer, diff --git a/native/src/widget/slider.rs b/native/src/widget/slider.rs index 3a998c40..e4f5c7a6 100644 --- a/native/src/widget/slider.rs +++ b/native/src/widget/slider.rs @@ -19,6 +19,10 @@ where self.width } + fn height(&self) -> Length { + Length::Shrink + } + fn layout( &self, renderer: &Renderer, diff --git a/native/src/widget/text.rs b/native/src/widget/text.rs index 10d892a3..3097b8f3 100644 --- a/native/src/widget/text.rs +++ b/native/src/widget/text.rs @@ -13,6 +13,10 @@ where self.width } + fn height(&self) -> Length { + self.height + } + fn layout( &self, renderer: &Renderer, diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs index 35e10000..d54cf82c 100644 --- a/native/src/widget/text_input.rs +++ b/native/src/widget/text_input.rs @@ -15,6 +15,10 @@ where self.width } + fn height(&self) -> Length { + Length::Shrink + } + fn layout( &self, renderer: &Renderer, |