me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Draft nodes for missing widgets

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2019-09-15 18:53:13 +02:00
parent 8834772fa7
commit 655978f480
16 changed files with 191 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

6
web/src/widget.rs
View file

@ -25,9 +25,5 @@ pub trait Widget<Message> {
&self,
bump: &'b bumpalo::Bump,
_bus: &Bus<Message>,
) -> dodrio::Node<'b> {
use dodrio::builder::*;
div(bump).children(vec![text("WIP")]).finish()
}
) -> dodrio::Node<'b>;
}

4
web/src/widget/button.rs
View file

@ -1,8 +1,8 @@
use crate::{Bus, Element, Widget};
use dodrio::bumpalo;
pub use iced::button::{Class, State};
use dodrio::bumpalo;
pub type Button<'a, Message> = iced::Button<'a, Message>;
impl<'a, Message> Widget<Message> for Button<'a, Message>

39
web/src/widget/checkbox.rs
View file

@ -1,12 +1,45 @@
use crate::{Color, Element, Widget};
use crate::{Bus, Color, Element, Widget};
use dodrio::bumpalo;
pub type Checkbox<Message> = iced::Checkbox<Color, Message>;
impl<Message> Widget<Message> for Checkbox<Message> {}
impl<Message> Widget<Message> for Checkbox<Message>
where
Message: 'static + Copy,
{
fn node<'b>(
&self,
bump: &'b bumpalo::Bump,
bus: &Bus<Message>,
) -> dodrio::Node<'b> {
use dodrio::builder::*;
let checkbox_label = bumpalo::format!(in bump, "{}", self.label);
let event_bus = bus.clone();
let msg = (self.on_toggle)(!self.is_checked);
label(bump)
.children(vec![
input(bump)
.attr("type", "checkbox")
.bool_attr("checked", self.is_checked)
.on("click", move |root, vdom, _event| {
event_bus.publish(msg, root);
vdom.schedule_render();
})
.finish(),
text(checkbox_label.into_bump_str()),
])
.finish()
}
}
impl<'a, Message> From<Checkbox<Message>> for Element<'a, Message>
where
Message: 'static,
Message: 'static + Copy,
{
fn from(checkbox: Checkbox<Message>) -> Element<'a, Message> {
Element::new(checkbox)

5
web/src/widget/column.rs
View file

@ -52,7 +52,10 @@ impl<'a, Message> Widget<Message> for Column<'a, Message> {
.map(|element| element.widget.node(bump, publish))
.collect();
div(bump).children(children).finish()
div(bump)
.attr("style", "display: flex; flex-direction: column")
.children(children)
.finish()
}
}

25
web/src/widget/image.rs
View file

@ -1,8 +1,29 @@
use crate::{Element, Widget};
use crate::{Bus, Element, Widget};
use dodrio::bumpalo;
pub type Image<'a> = iced::Image<&'a str>;
impl<'a, Message> Widget<Message> for Image<'a> {}
impl<'a, Message> Widget<Message> for Image<'a> {
fn node<'b>(
&self,
bump: &'b bumpalo::Bump,
_bus: &Bus<Message>,
) -> dodrio::Node<'b> {
use dodrio::builder::*;
let src = bumpalo::format!(in bump, "{}", self.image);
let mut image = img(bump).attr("src", src.into_bump_str());
if let Some(width) = self.width {
let width = bumpalo::format!(in bump, "{}", width);
image = image.attr("width", width.into_bump_str());
}
image.finish()
}
}
impl<'a, Message> From<Image<'a>> for Element<'a, Message> {
fn from(image: Image<'a>) -> Element<'a, Message> {

40
web/src/widget/radio.rs
View file

@ -1,12 +1,46 @@
use crate::{Color, Element, Widget};
use crate::{Bus, Color, Element, Widget};
use dodrio::bumpalo;
pub type Radio<Message> = iced::Radio<Color, Message>;
impl<Message> Widget<Message> for Radio<Message> {}
impl<Message> Widget<Message> for Radio<Message>
where
Message: 'static + Copy,
{
fn node<'b>(
&self,
bump: &'b bumpalo::Bump,
bus: &Bus<Message>,
) -> dodrio::Node<'b> {
use dodrio::builder::*;
let radio_label = bumpalo::format!(in bump, "{}", self.label);
let event_bus = bus.clone();
let on_click = self.on_click;
label(bump)
.attr("style", "display: block")
.children(vec![
input(bump)
.attr("type", "radio")
.bool_attr("checked", self.is_selected)
.on("click", move |root, vdom, _event| {
event_bus.publish(on_click, root);
vdom.schedule_render();
})
.finish(),
text(radio_label.into_bump_str()),
])
.finish()
}
}
impl<'a, Message> From<Radio<Message>> for Element<'a, Message>
where
Message: 'static,
Message: 'static + Copy,
{
fn from(radio: Radio<Message>) -> Element<'a, Message> {
Element::new(radio)

5
web/src/widget/row.rs
View file

@ -40,7 +40,10 @@ impl<'a, Message> Widget<Message> for Row<'a, Message> {
.map(|element| element.widget.node(bump, publish))
.collect();
div(bump).children(children).finish()
div(bump)
.attr("style", "display: flex; flex-direction: row")
.children(children)
.finish()
}
}

55
web/src/widget/slider.rs
View file

@ -1,14 +1,61 @@
use crate::{Element, Widget};
use crate::{Bus, Element, Widget};
pub use iced::slider::State;
use dodrio::bumpalo;
pub type Slider<'a, Message> = iced::Slider<'a, Message>;
impl<'a, Message> Widget<Message> for Slider<'a, Message> {}
pub use iced::slider::State;
impl<'a, Message> Widget<Message> for Slider<'a, Message>
where
Message: 'static + Copy,
{
fn node<'b>(
&self,
bump: &'b bumpalo::Bump,
bus: &Bus<Message>,
) -> dodrio::Node<'b> {
use dodrio::builder::*;
use wasm_bindgen::JsCast;
let (start, end) = self.range.clone().into_inner();
let min = bumpalo::format!(in bump, "{}", start);
let max = bumpalo::format!(in bump, "{}", end);
let value = bumpalo::format!(in bump, "{}", self.value);
let on_change = self.on_change.clone();
let event_bus = bus.clone();
// TODO: Make `step` configurable
label(bump)
.children(vec![input(bump)
.attr("type", "range")
.attr("step", "0.01")
.attr("min", min.into_bump_str())
.attr("max", max.into_bump_str())
.attr("value", value.into_bump_str())
.on("input", move |root, vdom, event| {
let slider = match event.target().and_then(|t| {
t.dyn_into::<web_sys::HtmlInputElement>().ok()
}) {
None => return,
Some(slider) => slider,
};
if let Ok(value) = slider.value().parse::<f32>() {
event_bus.publish(on_change(value), root);
vdom.schedule_render();
}
})
.finish()])
.finish()
}
}
impl<'a, Message> From<Slider<'a, Message>> for Element<'a, Message>
where
Message: 'static,
Message: 'static + Copy,
{
fn from(slider: Slider<'a, Message>) -> Element<'a, Message> {
Element::new(slider)