diff options
author | 2019-12-30 21:32:21 +0100 | |
---|---|---|
committer | 2019-12-30 21:33:27 +0100 | |
commit | 3a327e08e96d9588d145c32afe4f04f37a8f0f0f (patch) | |
tree | b1da004410c0dc4ba82bd0c3262ea3359fad38b2 /native | |
parent | 8426bf953cb50f3b7fcb1e0ec8c2fdf22d2b01af (diff) | |
download | iced-3a327e08e96d9588d145c32afe4f04f37a8f0f0f.tar.gz iced-3a327e08e96d9588d145c32afe4f04f37a8f0f0f.tar.bz2 iced-3a327e08e96d9588d145c32afe4f04f37a8f0f0f.zip |
Rename `Empty` widget to `Space`
Diffstat (limited to 'native')
-rw-r--r-- | native/src/widget.rs | 6 | ||||
-rw-r--r-- | native/src/widget/space.rs (renamed from native/src/widget/empty.rs) | 59 |
2 files changed, 33 insertions, 32 deletions
diff --git a/native/src/widget.rs b/native/src/widget.rs index b73f229e..dcc99645 100644 --- a/native/src/widget.rs +++ b/native/src/widget.rs @@ -24,12 +24,12 @@ pub mod button; pub mod checkbox; pub mod column; pub mod container; -pub mod empty; pub mod image; pub mod radio; pub mod row; pub mod scrollable; pub mod slider; +pub mod space; pub mod svg; pub mod text; pub mod text_input; @@ -43,8 +43,6 @@ pub use column::Column; #[doc(no_inline)] pub use container::Container; #[doc(no_inline)] -pub use empty::Empty; -#[doc(no_inline)] pub use image::Image; #[doc(no_inline)] pub use radio::Radio; @@ -55,6 +53,8 @@ pub use scrollable::Scrollable; #[doc(no_inline)] pub use slider::Slider; #[doc(no_inline)] +pub use space::Space; +#[doc(no_inline)] pub use svg::Svg; #[doc(no_inline)] pub use text::Text; diff --git a/native/src/widget/empty.rs b/native/src/widget/space.rs index f670048f..2029c52f 100644 --- a/native/src/widget/empty.rs +++ b/native/src/widget/space.rs @@ -8,43 +8,42 @@ use crate::{ /// An amount of empty space. /// /// It can be useful if you want to fill some space with nothing. -/// -/// [`Empty`]: struct.Empty.html #[derive(Debug)] -pub struct Empty { +pub struct Space { width: Length, height: Length, } -impl Empty { - /// Creates an amount of [`Empty`] space. +impl Space { + /// Creates an amount of empty [`Space`] with the given width and height. /// - /// [`Empty`]: struct.Empty.html - pub fn new() -> Self { - Empty { - width: Length::Shrink, - height: Length::Shrink, - } + /// [`Space`]: struct.Space.html + pub fn new(width: Length, height: Length) -> Self { + Space { width, height } } - /// Sets the width of the [`Empty`] space. + /// Creates an amount of horizontal [`Space`]. /// - /// [`Empty`]: struct..html - pub fn width(mut self, width: Length) -> Self { - self.width = width; - self + /// [`Space`]: struct.Space.html + pub fn with_width(width: Length) -> Self { + Space { + width, + height: Length::Shrink, + } } - /// Sets the height of the [`Empty`] space. + /// Creates an amount of vertical [`Space`]. /// - /// [`Empty`]: struct.Column.html - pub fn height(mut self, height: Length) -> Self { - self.height = height; - self + /// [`Space`]: struct.Space.html + pub fn with_height(height: Length) -> Self { + Space { + width: Length::Shrink, + height, + } } } -impl<'a, Message, Renderer> Widget<Message, Renderer> for Empty +impl<'a, Message, Renderer> Widget<Message, Renderer> for Space where Renderer: self::Renderer, { @@ -76,28 +75,30 @@ where } fn hash_layout(&self, state: &mut Hasher) { - std::any::TypeId::of::<Empty>().hash(state); + std::any::TypeId::of::<Space>().hash(state); self.width.hash(state); self.height.hash(state); } } -/// The renderer of an amount of [`Empty`] space. +/// The renderer of an amount of [`Space`]. /// -/// [`Empty`]: struct.Empty.html +/// [`Space`]: struct.Space.html pub trait Renderer: crate::Renderer { - /// Draws an amount of [`Empty`] space. + /// Draws an amount of empty [`Space`]. /// /// You should most likely return an empty primitive here. + /// + /// [`Space`]: struct.Space.html fn draw(&mut self, bounds: Rectangle) -> Self::Output; } -impl<'a, Message, Renderer> From<Empty> for Element<'a, Message, Renderer> +impl<'a, Message, Renderer> From<Space> for Element<'a, Message, Renderer> where Renderer: self::Renderer, Message: 'static, { - fn from(empty: Empty) -> Element<'a, Message, Renderer> { - Element::new(empty) + fn from(space: Space) -> Element<'a, Message, Renderer> { + Element::new(space) } } |