summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2019-09-21 13:38:14 +0200
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2019-09-21 13:38:14 +0200
commit86dede4c4cc2bca9be7d2e6bd831daa98bd7043d (patch)
tree80c5a110be5a2cea664aa92b0463b1d5147fab07 /web
parenteda1048dbcf5753dc6171c3ee1478ec44468d5e3 (diff)
downloadiced-86dede4c4cc2bca9be7d2e6bd831daa98bd7043d.tar.gz
iced-86dede4c4cc2bca9be7d2e6bd831daa98bd7043d.tar.bz2
iced-86dede4c4cc2bca9be7d2e6bd831daa98bd7043d.zip
Make example work on web and update READMEs
Diffstat (limited to 'web')
-rw-r--r--web/src/widget/button.rs4
-rw-r--r--web/src/widget/checkbox.rs1
-rw-r--r--web/src/widget/column.rs1
-rw-r--r--web/src/widget/image.rs2
-rw-r--r--web/src/widget/radio.rs1
-rw-r--r--web/src/widget/row.rs1
-rw-r--r--web/src/widget/slider.rs5
-rw-r--r--web/src/widget/text.rs1
8 files changed, 12 insertions, 4 deletions
diff --git a/web/src/widget/button.rs b/web/src/widget/button.rs
index 36b35901..23a4165a 100644
--- a/web/src/widget/button.rs
+++ b/web/src/widget/button.rs
@@ -2,7 +2,7 @@ use crate::{Bus, Element, Widget};
use dodrio::bumpalo;
-pub type Button<'a, Message> = iced_core::Button<'a, Message>;
+pub use iced_core::button::*;
impl<'a, Message> Widget<Message> for Button<'a, Message>
where
@@ -29,6 +29,8 @@ where
});
}
+ // TODO: Complete styling
+
node.finish()
}
}
diff --git a/web/src/widget/checkbox.rs b/web/src/widget/checkbox.rs
index 34995781..72f0a2aa 100644
--- a/web/src/widget/checkbox.rs
+++ b/web/src/widget/checkbox.rs
@@ -20,6 +20,7 @@ where
let event_bus = bus.clone();
let msg = (self.on_toggle)(!self.is_checked);
+ // TODO: Complete styling
label(bump)
.children(vec![
input(bump)
diff --git a/web/src/widget/column.rs b/web/src/widget/column.rs
index 99491647..becd6bc6 100644
--- a/web/src/widget/column.rs
+++ b/web/src/widget/column.rs
@@ -18,6 +18,7 @@ impl<'a, Message> Widget<Message> for Column<'a, Message> {
.map(|element| element.widget.node(bump, publish))
.collect();
+ // TODO: Complete styling
div(bump)
.attr("style", "display: flex; flex-direction: column")
.children(children)
diff --git a/web/src/widget/image.rs b/web/src/widget/image.rs
index 48ff539f..fd4ff0df 100644
--- a/web/src/widget/image.rs
+++ b/web/src/widget/image.rs
@@ -29,6 +29,8 @@ impl<'a, Message> Widget<Message> for Image<'a> {
}
}
+ // TODO: Complete styling
+
image.finish()
}
}
diff --git a/web/src/widget/radio.rs b/web/src/widget/radio.rs
index 9063770a..d249ad26 100644
--- a/web/src/widget/radio.rs
+++ b/web/src/widget/radio.rs
@@ -20,6 +20,7 @@ where
let event_bus = bus.clone();
let on_click = self.on_click;
+ // TODO: Complete styling
label(bump)
.attr("style", "display: block")
.children(vec![
diff --git a/web/src/widget/row.rs b/web/src/widget/row.rs
index d4f4c4a0..cf6ae594 100644
--- a/web/src/widget/row.rs
+++ b/web/src/widget/row.rs
@@ -18,6 +18,7 @@ impl<'a, Message> Widget<Message> for Row<'a, Message> {
.map(|element| element.widget.node(bump, publish))
.collect();
+ // TODO: Complete styling
div(bump)
.attr("style", "display: flex; flex-direction: row")
.children(children)
diff --git a/web/src/widget/slider.rs b/web/src/widget/slider.rs
index 19668025..54b2fdf6 100644
--- a/web/src/widget/slider.rs
+++ b/web/src/widget/slider.rs
@@ -2,9 +2,7 @@ use crate::{Bus, Element, Widget};
use dodrio::bumpalo;
-pub type Slider<'a, Message> = iced_core::Slider<'a, Message>;
-
-pub use iced_core::slider::State;
+pub use iced_core::slider::*;
impl<'a, Message> Widget<Message> for Slider<'a, Message>
where
@@ -28,6 +26,7 @@ where
let event_bus = bus.clone();
// TODO: Make `step` configurable
+ // TODO: Complete styling
label(bump)
.children(vec![input(bump)
.attr("type", "range")
diff --git a/web/src/widget/text.rs b/web/src/widget/text.rs
index ef9170ef..41ccd6fc 100644
--- a/web/src/widget/text.rs
+++ b/web/src/widget/text.rs
@@ -14,6 +14,7 @@ impl<'a, Message> Widget<Message> for Text {
let content = bumpalo::format!(in bump, "{}", self.content);
let size = bumpalo::format!(in bump, "font-size: {}px", self.size.unwrap_or(20));
+ // TODO: Complete styling
p(bump)
.attr("style", size.into_bump_str())
.children(vec![text(content.into_bump_str())])