Implement Empty widget

It can be useful if you want to fill some space with nothing.
This commit is contained in:
Héctor Ramón Jiménez 2019-12-30 19:20:59 +01:00
parent 7163e1d8b6
commit 8426bf953c
8 changed files with 191 additions and 4 deletions

View File

@ -1,6 +1,6 @@
use iced::{ use iced::{
button, scrollable, slider, text_input, Button, Checkbox, Color, Column, button, scrollable, slider, text_input, Button, Checkbox, Color, Column,
Container, Element, HorizontalAlignment, Image, Length, Radio, Row, Container, Element, Empty, HorizontalAlignment, Image, Length, Radio, Row,
Sandbox, Scrollable, Settings, Slider, Text, TextInput, Sandbox, Scrollable, Settings, Slider, Text, TextInput,
}; };
@ -67,7 +67,7 @@ impl Sandbox for Tour {
); );
} }
controls = controls.push(Column::new()); controls = controls.push(Empty::new().width(Length::Fill));
if steps.can_continue() { if steps.can_continue() {
controls = controls.push( controls = controls.push(

View File

@ -24,6 +24,7 @@ pub mod button;
pub mod checkbox; pub mod checkbox;
pub mod column; pub mod column;
pub mod container; pub mod container;
pub mod empty;
pub mod image; pub mod image;
pub mod radio; pub mod radio;
pub mod row; pub mod row;
@ -42,6 +43,8 @@ pub use column::Column;
#[doc(no_inline)] #[doc(no_inline)]
pub use container::Container; pub use container::Container;
#[doc(no_inline)] #[doc(no_inline)]
pub use empty::Empty;
#[doc(no_inline)]
pub use image::Image; pub use image::Image;
#[doc(no_inline)] #[doc(no_inline)]
pub use radio::Radio; pub use radio::Radio;

103
native/src/widget/empty.rs Normal file
View File

@ -0,0 +1,103 @@
//! Distribute content vertically.
use std::hash::Hash;
use crate::{
layout, Element, Hasher, Layout, Length, Point, Rectangle, Size, Widget,
};
/// 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 {
width: Length,
height: Length,
}
impl Empty {
/// Creates an amount of [`Empty`] space.
///
/// [`Empty`]: struct.Empty.html
pub fn new() -> Self {
Empty {
width: Length::Shrink,
height: Length::Shrink,
}
}
/// Sets the width of the [`Empty`] space.
///
/// [`Empty`]: struct..html
pub fn width(mut self, width: Length) -> Self {
self.width = width;
self
}
/// Sets the height of the [`Empty`] space.
///
/// [`Empty`]: struct.Column.html
pub fn height(mut self, height: Length) -> Self {
self.height = height;
self
}
}
impl<'a, Message, Renderer> Widget<Message, Renderer> for Empty
where
Renderer: self::Renderer,
{
fn width(&self) -> Length {
self.width
}
fn height(&self) -> Length {
self.height
}
fn layout(
&self,
_renderer: &Renderer,
limits: &layout::Limits,
) -> layout::Node {
let limits = limits.width(self.width).height(self.height);
layout::Node::new(limits.resolve(Size::ZERO))
}
fn draw(
&self,
renderer: &mut Renderer,
layout: Layout<'_>,
_cursor_position: Point,
) -> Renderer::Output {
renderer.draw(layout.bounds())
}
fn hash_layout(&self, state: &mut Hasher) {
std::any::TypeId::of::<Empty>().hash(state);
self.width.hash(state);
self.height.hash(state);
}
}
/// The renderer of an amount of [`Empty`] space.
///
/// [`Empty`]: struct.Empty.html
pub trait Renderer: crate::Renderer {
/// Draws an amount of [`Empty`] space.
///
/// You should most likely return an empty primitive here.
fn draw(&mut self, bounds: Rectangle) -> Self::Output;
}
impl<'a, Message, Renderer> From<Empty> for Element<'a, Message, Renderer>
where
Renderer: self::Renderer,
Message: 'static,
{
fn from(empty: Empty) -> Element<'a, Message, Renderer> {
Element::new(empty)
}
}

View File

@ -1,6 +1,6 @@
pub use iced_winit::{ pub use iced_winit::{
Align, Background, Color, Command, Font, HorizontalAlignment, Length, Align, Background, Color, Command, Empty, Font, HorizontalAlignment,
Subscription, VerticalAlignment, Length, Subscription, VerticalAlignment,
}; };
pub mod widget { pub mod widget {

View File

@ -25,6 +25,7 @@ pub mod text_input;
mod checkbox; mod checkbox;
mod column; mod column;
mod container; mod container;
mod empty;
mod image; mod image;
mod radio; mod radio;
mod row; mod row;
@ -44,6 +45,7 @@ pub use text_input::TextInput;
pub use checkbox::Checkbox; pub use checkbox::Checkbox;
pub use column::Column; pub use column::Column;
pub use container::Container; pub use container::Container;
pub use empty::Empty;
pub use image::Image; pub use image::Image;
pub use radio::Radio; pub use radio::Radio;
pub use row::Row; pub use row::Row;

70
web/src/widget/empty.rs Normal file
View File

@ -0,0 +1,70 @@
use crate::{style, Bus, Element, Length, Widget};
use dodrio::bumpalo;
/// 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 {
width: Length,
height: Length,
}
impl Empty {
/// Creates an amount of [`Empty`] space.
///
/// [`Empty`]: struct.Empty.html
pub fn new() -> Self {
Empty {
width: Length::Shrink,
height: Length::Shrink,
}
}
/// Sets the width of the [`Empty`] space.
///
/// [`Empty`]: struct..html
pub fn width(mut self, width: Length) -> Self {
self.width = width;
self
}
/// Sets the height of the [`Empty`] space.
///
/// [`Empty`]: struct.Column.html
pub fn height(mut self, height: Length) -> Self {
self.height = height;
self
}
}
impl<'a, Message> Widget<Message> for Empty {
fn node<'b>(
&self,
bump: &'b bumpalo::Bump,
_publish: &Bus<Message>,
_style_sheet: &mut style::Sheet<'b>,
) -> dodrio::Node<'b> {
use dodrio::builder::*;
let width = style::length(self.width);
let height = style::length(self.height);
let style = bumpalo::format!(
in bump,
"width: {}; height: {};",
width,
height
);
div(bump).attr("style", style.into_bump_str()).finish()
}
}
impl<'a, Message> From<Empty> for Element<'a, Message> {
fn from(empty: Empty) -> Element<'a, Message> {
Element::new(empty)
}
}

View File

@ -1,6 +1,7 @@
mod button; mod button;
mod checkbox; mod checkbox;
mod column; mod column;
mod empty;
mod image; mod image;
mod radio; mod radio;
mod row; mod row;

View File

@ -0,0 +1,8 @@
use crate::{Primitive, Renderer};
use iced_native::{empty, MouseCursor, Rectangle};
impl empty::Renderer for Renderer {
fn draw(&mut self, _bounds: Rectangle) -> Self::Output {
(Primitive::None, MouseCursor::OutOfBounds)
}
}