Draft widget nodes and wire interaction

This commit is contained in:
Héctor Ramón Jiménez 2019-09-15 17:43:15 +02:00
parent 27ac85a9d9
commit 8834772fa7
10 changed files with 223 additions and 22 deletions

View file

@ -1,14 +1,42 @@
use crate::{Element, Widget};
use crate::{Bus, Element, Widget};
use dodrio::bumpalo;
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> Widget<Message> for Button<'a, Message>
where
Message: 'static + Copy,
{
fn node<'b>(
&self,
bump: &'b bumpalo::Bump,
bus: &Bus<Message>,
) -> dodrio::Node<'b> {
use dodrio::builder::*;
let label = bumpalo::format!(in bump, "{}", self.label);
let mut node = button(bump).children(vec![text(label.into_bump_str())]);
if let Some(on_press) = self.on_press {
let event_bus = bus.clone();
node = node.on("click", move |root, vdom, _event| {
event_bus.publish(on_press, root);
vdom.schedule_render();
});
}
node.finish()
}
}
impl<'a, Message> From<Button<'a, Message>> for Element<'a, Message>
where
Message: 'static,
Message: 'static + Copy,
{
fn from(button: Button<'a, Message>) -> Element<'a, Message> {
Element::new(button)

View file

@ -1,4 +1,6 @@
use crate::{Align, Element, Widget};
use crate::{Align, Bus, Element, Widget};
use dodrio::bumpalo;
pub struct Column<'a, Message> {
children: Vec<Element<'a, Message>>,
@ -36,7 +38,23 @@ impl<'a, Message> Column<'a, Message> {
}
}
impl<'a, Message> Widget<Message> for Column<'a, Message> {}
impl<'a, Message> Widget<Message> for Column<'a, Message> {
fn node<'b>(
&self,
bump: &'b bumpalo::Bump,
publish: &Bus<Message>,
) -> dodrio::Node<'b> {
use dodrio::builder::*;
let children: Vec<_> = self
.children
.iter()
.map(|element| element.widget.node(bump, publish))
.collect();
div(bump).children(children).finish()
}
}
impl<'a, Message> From<Column<'a, Message>> for Element<'a, Message>
where

View file

@ -1,4 +1,6 @@
use crate::{Element, Widget};
use crate::{Bus, Element, Widget};
use dodrio::bumpalo;
pub struct Row<'a, Message> {
children: Vec<Element<'a, Message>>,
@ -24,7 +26,23 @@ impl<'a, Message> Row<'a, Message> {
}
}
impl<'a, Message> Widget<Message> for Row<'a, Message> {}
impl<'a, Message> Widget<Message> for Row<'a, Message> {
fn node<'b>(
&self,
bump: &'b bumpalo::Bump,
publish: &Bus<Message>,
) -> dodrio::Node<'b> {
use dodrio::builder::*;
let children: Vec<_> = self
.children
.iter()
.map(|element| element.widget.node(bump, publish))
.collect();
div(bump).children(children).finish()
}
}
impl<'a, Message> From<Row<'a, Message>> for Element<'a, Message>
where

View file

@ -1,10 +1,27 @@
use crate::{Color, Element, Widget};
use crate::{Bus, Color, Element, Widget};
use dodrio::bumpalo;
pub use iced::text::HorizontalAlignment;
pub type Text = iced::Text<Color>;
impl<'a, Message> Widget<Message> for Text {}
impl<'a, Message> Widget<Message> for Text {
fn node<'b>(
&self,
bump: &'b bumpalo::Bump,
_publish: &Bus<Message>,
) -> dodrio::Node<'b> {
use dodrio::builder::*;
let content = bumpalo::format!(in bump, "{}", self.content);
let size = bumpalo::format!(in bump, "font-size: {}px", self.size.unwrap_or(20));
p(bump)
.attr("style", size.into_bump_str())
.children(vec![text(content.into_bump_str())])
.finish()
}
}
impl<'a, Message> From<Text> for Element<'a, Message> {
fn from(text: Text) -> Element<'a, Message> {