diff options
author | 2019-09-14 20:54:50 +0200 | |
---|---|---|
committer | 2019-09-14 20:54:50 +0200 | |
commit | 27ac85a9d98474904c422a891e54888376dec00a (patch) | |
tree | e268525f5bdb3e9631ba1156aaa6b02561dd03d4 /web/src | |
parent | a97401aed2a173260a4abfdb65a77975ce6c0f01 (diff) | |
download | iced-27ac85a9d98474904c422a891e54888376dec00a.tar.gz iced-27ac85a9d98474904c422a891e54888376dec00a.tar.bz2 iced-27ac85a9d98474904c422a891e54888376dec00a.zip |
Draft web runtime and widgets
Diffstat (limited to 'web/src')
-rw-r--r-- | web/src/color.rs | 16 | ||||
-rw-r--r-- | web/src/element.rs | 47 | ||||
-rw-r--r-- | web/src/lib.rs | 27 | ||||
-rw-r--r-- | web/src/widget.rs | 20 | ||||
-rw-r--r-- | web/src/widget/button.rs | 16 | ||||
-rw-r--r-- | web/src/widget/checkbox.rs | 14 | ||||
-rw-r--r-- | web/src/widget/column.rs | 48 | ||||
-rw-r--r-- | web/src/widget/image.rs | 11 | ||||
-rw-r--r-- | web/src/widget/radio.rs | 14 | ||||
-rw-r--r-- | web/src/widget/row.rs | 36 | ||||
-rw-r--r-- | web/src/widget/slider.rs | 16 | ||||
-rw-r--r-- | web/src/widget/text.rs | 13 |
12 files changed, 278 insertions, 0 deletions
diff --git a/web/src/color.rs b/web/src/color.rs new file mode 100644 index 00000000..2624c3c9 --- /dev/null +++ b/web/src/color.rs @@ -0,0 +1,16 @@ +#[derive(Debug, Clone, Copy, PartialEq)] +pub struct Color { + pub r: f32, + pub g: f32, + pub b: f32, + pub a: f32, +} + +impl Color { + pub const BLACK: Color = Color { + r: 0.0, + g: 0.0, + b: 0.0, + a: 1.0, + }; +} diff --git a/web/src/element.rs b/web/src/element.rs new file mode 100644 index 00000000..c0c9ce5d --- /dev/null +++ b/web/src/element.rs @@ -0,0 +1,47 @@ +use crate::{Color, Widget}; + +pub struct Element<'a, Message> { + pub(crate) widget: Box<dyn Widget<Message> + 'a>, +} + +impl<'a, Message> Element<'a, Message> { + pub fn new(widget: impl Widget<Message> + 'a) -> Self { + Self { + widget: Box::new(widget), + } + } + + pub fn explain(self, color: Color) -> Element<'a, Message> { + self + } + + pub fn map<F, B>(self, f: F) -> Element<'a, B> + where + Message: 'static, + B: 'static, + F: 'static + Fn(Message) -> B, + { + Element { + widget: Box::new(Map::new(self.widget, f)), + } + } +} + +struct Map<'a, A, B> { + widget: Box<dyn Widget<A> + 'a>, + mapper: Box<dyn Fn(A) -> B>, +} + +impl<'a, A, B> Map<'a, A, B> { + pub fn new<F>(widget: Box<dyn Widget<A> + 'a>, mapper: F) -> Map<'a, A, B> + where + F: 'static + Fn(A) -> B, + { + Map { + widget, + mapper: Box::new(mapper), + } + } +} + +impl<'a, A, B> Widget<B> for Map<'a, A, B> {} diff --git a/web/src/lib.rs b/web/src/lib.rs index 8b137891..187e8ad9 100644 --- a/web/src/lib.rs +++ b/web/src/lib.rs @@ -1 +1,28 @@ +use futures::Future; +mod color; +mod element; +mod widget; + +pub use color::Color; +pub use element::Element; +pub use iced::Align; +pub use widget::*; + +pub trait UserInterface { + type Message; + + fn update( + &mut self, + message: Self::Message, + ) -> Box<dyn Future<Item = Self::Message, Error = ()>>; + + fn view(&mut self) -> Element<Self::Message>; + + fn run(mut self) + where + Self: Sized, + { + let element = self.view(); + } +} diff --git a/web/src/widget.rs b/web/src/widget.rs new file mode 100644 index 00000000..5cb89a60 --- /dev/null +++ b/web/src/widget.rs @@ -0,0 +1,20 @@ +pub mod button; +pub mod slider; +pub mod text; + +mod checkbox; +mod column; +mod image; +mod radio; +mod row; + +pub use button::Button; +pub use checkbox::Checkbox; +pub use column::Column; +pub use image::Image; +pub use radio::Radio; +pub use row::Row; +pub use slider::Slider; +pub use text::Text; + +pub trait Widget<Message> {} diff --git a/web/src/widget/button.rs b/web/src/widget/button.rs new file mode 100644 index 00000000..1f117d82 --- /dev/null +++ b/web/src/widget/button.rs @@ -0,0 +1,16 @@ +use crate::{Element, Widget}; + +pub use iced::button::{Class, State}; + +pub type Button<'a, Message> = iced::Button<'a, Message>; + +impl<'a, Message> Widget<Message> for Button<'a, Message> {} + +impl<'a, Message> From<Button<'a, Message>> for Element<'a, Message> +where + Message: 'static, +{ + fn from(button: Button<'a, Message>) -> Element<'a, Message> { + Element::new(button) + } +} diff --git a/web/src/widget/checkbox.rs b/web/src/widget/checkbox.rs new file mode 100644 index 00000000..a231d801 --- /dev/null +++ b/web/src/widget/checkbox.rs @@ -0,0 +1,14 @@ +use crate::{Color, Element, Widget}; + +pub type Checkbox<Message> = iced::Checkbox<Color, Message>; + +impl<Message> Widget<Message> for Checkbox<Message> {} + +impl<'a, Message> From<Checkbox<Message>> for Element<'a, Message> +where + Message: 'static, +{ + fn from(checkbox: Checkbox<Message>) -> Element<'a, Message> { + Element::new(checkbox) + } +} diff --git a/web/src/widget/column.rs b/web/src/widget/column.rs new file mode 100644 index 00000000..84068ce6 --- /dev/null +++ b/web/src/widget/column.rs @@ -0,0 +1,48 @@ +use crate::{Align, Element, Widget}; + +pub struct Column<'a, Message> { + children: Vec<Element<'a, Message>>, +} + +impl<'a, Message> Column<'a, Message> { + pub fn new() -> Self { + Self { + children: Vec::new(), + } + } + + pub fn spacing(self, _spacing: u16) -> Self { + self + } + + pub fn padding(self, _padding: u16) -> Self { + self + } + + pub fn max_width(self, _max_width: u16) -> Self { + self + } + + pub fn align_items(self, _align: Align) -> Self { + self + } + + pub fn push<E>(mut self, element: E) -> Self + where + E: Into<Element<'a, Message>>, + { + self.children.push(element.into()); + self + } +} + +impl<'a, Message> Widget<Message> for Column<'a, Message> {} + +impl<'a, Message> From<Column<'a, Message>> for Element<'a, Message> +where + Message: 'static, +{ + fn from(column: Column<'a, Message>) -> Element<'a, Message> { + Element::new(column) + } +} diff --git a/web/src/widget/image.rs b/web/src/widget/image.rs new file mode 100644 index 00000000..ac144fd8 --- /dev/null +++ b/web/src/widget/image.rs @@ -0,0 +1,11 @@ +use crate::{Element, Widget}; + +pub type Image<'a> = iced::Image<&'a str>; + +impl<'a, Message> Widget<Message> for Image<'a> {} + +impl<'a, Message> From<Image<'a>> for Element<'a, Message> { + fn from(image: Image<'a>) -> Element<'a, Message> { + Element::new(image) + } +} diff --git a/web/src/widget/radio.rs b/web/src/widget/radio.rs new file mode 100644 index 00000000..0c28b46f --- /dev/null +++ b/web/src/widget/radio.rs @@ -0,0 +1,14 @@ +use crate::{Color, Element, Widget}; + +pub type Radio<Message> = iced::Radio<Color, Message>; + +impl<Message> Widget<Message> for Radio<Message> {} + +impl<'a, Message> From<Radio<Message>> for Element<'a, Message> +where + Message: 'static, +{ + fn from(radio: Radio<Message>) -> Element<'a, Message> { + Element::new(radio) + } +} diff --git a/web/src/widget/row.rs b/web/src/widget/row.rs new file mode 100644 index 00000000..fc474ec3 --- /dev/null +++ b/web/src/widget/row.rs @@ -0,0 +1,36 @@ +use crate::{Element, Widget}; + +pub struct Row<'a, Message> { + children: Vec<Element<'a, Message>>, +} + +impl<'a, Message> Row<'a, Message> { + pub fn new() -> Self { + Self { + children: Vec::new(), + } + } + + pub fn spacing(self, _spacing: u16) -> Self { + self + } + + pub fn push<E>(mut self, element: E) -> Self + where + E: Into<Element<'a, Message>>, + { + self.children.push(element.into()); + self + } +} + +impl<'a, Message> Widget<Message> for Row<'a, Message> {} + +impl<'a, Message> From<Row<'a, Message>> for Element<'a, Message> +where + Message: 'static, +{ + fn from(column: Row<'a, Message>) -> Element<'a, Message> { + Element::new(column) + } +} diff --git a/web/src/widget/slider.rs b/web/src/widget/slider.rs new file mode 100644 index 00000000..9c83befb --- /dev/null +++ b/web/src/widget/slider.rs @@ -0,0 +1,16 @@ +use crate::{Element, Widget}; + +pub use iced::slider::State; + +pub type Slider<'a, Message> = iced::Slider<'a, Message>; + +impl<'a, Message> Widget<Message> for Slider<'a, Message> {} + +impl<'a, Message> From<Slider<'a, Message>> for Element<'a, Message> +where + Message: 'static, +{ + fn from(slider: Slider<'a, Message>) -> Element<'a, Message> { + Element::new(slider) + } +} diff --git a/web/src/widget/text.rs b/web/src/widget/text.rs new file mode 100644 index 00000000..0c1f75b6 --- /dev/null +++ b/web/src/widget/text.rs @@ -0,0 +1,13 @@ +use crate::{Color, Element, Widget}; + +pub use iced::text::HorizontalAlignment; + +pub type Text = iced::Text<Color>; + +impl<'a, Message> Widget<Message> for Text {} + +impl<'a, Message> From<Text> for Element<'a, Message> { + fn from(text: Text) -> Element<'a, Message> { + Element::new(text) + } +} |