From 6cdf69e76b8052fb726d5c2bf6c9746182e04d05 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sat, 16 Nov 2019 22:08:49 +0100
Subject: Make `width` and `height` required methods
---
native/src/element.rs | 16 ++++++++++++++++
native/src/widget.rs | 12 ++++--------
native/src/widget/button.rs | 10 +++++++++-
native/src/widget/checkbox.rs | 4 ++++
native/src/widget/column.rs | 4 ++++
native/src/widget/container.rs | 4 ++++
native/src/widget/image.rs | 10 +++++++++-
native/src/widget/radio.rs | 4 ++++
native/src/widget/row.rs | 4 ++++
native/src/widget/scrollable.rs | 8 ++++++++
native/src/widget/slider.rs | 4 ++++
native/src/widget/text.rs | 4 ++++
native/src/widget/text_input.rs | 4 ++++
13 files changed, 78 insertions(+), 10 deletions(-)
(limited to 'native/src')
diff --git a/native/src/element.rs b/native/src/element.rs
index 23f069f1..791bf9cf 100644
--- a/native/src/element.rs
+++ b/native/src/element.rs
@@ -299,6 +299,14 @@ where
A: Clone,
Renderer: crate::Renderer,
{
+ fn width(&self) -> Length {
+ self.widget.width()
+ }
+
+ fn height(&self) -> Length {
+ self.widget.height()
+ }
+
fn layout(
&self,
renderer: &Renderer,
@@ -375,6 +383,14 @@ impl<'a, Message, Renderer> Widget<Message, Renderer>
where
Renderer: crate::Renderer + renderer::Debugger,
{
+ fn width(&self) -> Length {
+ self.element.widget.width()
+ }
+
+ fn height(&self) -> Length {
+ self.element.widget.height()
+ }
+
fn layout(
&self,
renderer: &Renderer,
diff --git a/native/src/widget.rs b/native/src/widget.rs
index 9010b06f..ff765ee6 100644
--- a/native/src/widget.rs
+++ b/native/src/widget.rs
@@ -69,6 +69,10 @@ pub trait Widget<Message, Renderer>: std::fmt::Debug
where
Renderer: crate::Renderer,
{
+ fn width(&self) -> Length;
+
+ fn height(&self) -> Length;
+
/// Returns the [`Node`] of the [`Widget`].
///
/// This [`Node`] is used by the runtime to compute the [`Layout`] of the
@@ -83,14 +87,6 @@ where
limits: &layout::Limits,
) -> layout::Node;
- fn width(&self) -> Length {
- Length::Shrink
- }
-
- fn height(&self) -> Length {
- Length::Shrink
- }
-
/// Draws the [`Widget`] using the associated `Renderer`.
///
/// [`Widget`]: trait.Widget.html
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,
--
cgit