From 27ac85a9d98474904c422a891e54888376dec00a Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sat, 14 Sep 2019 20:54:50 +0200
Subject: Draft web runtime and widgets

---
 web/src/widget/text.rs | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 web/src/widget/text.rs

(limited to 'web/src/widget/text.rs')

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)
+    }
+}
-- 
cgit 


From 8834772fa70850559f7bd82cc8432394e3fd9db7 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sun, 15 Sep 2019 17:43:15 +0200
Subject: Draft widget nodes and wire interaction

---
 web/src/widget/text.rs | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'web/src/widget/text.rs')

diff --git a/web/src/widget/text.rs b/web/src/widget/text.rs
index 0c1f75b6..b8fe9565 100644
--- a/web/src/widget/text.rs
+++ b/web/src/widget/text.rs
@@ -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> {
-- 
cgit 


From b83a4b42dd912b5f59d40e7d4f7f7ccdabc43019 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 19 Sep 2019 18:47:01 +0200
Subject: Remove generic `Color` in widgets

---
 web/src/widget/text.rs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'web/src/widget/text.rs')

diff --git a/web/src/widget/text.rs b/web/src/widget/text.rs
index b8fe9565..a5709775 100644
--- a/web/src/widget/text.rs
+++ b/web/src/widget/text.rs
@@ -1,9 +1,7 @@
-use crate::{Bus, Color, Element, Widget};
+use crate::{Bus, Element, Widget};
 use dodrio::bumpalo;
 
-pub use iced::text::HorizontalAlignment;
-
-pub type Text = iced::Text<Color>;
+pub use iced::text::*;
 
 impl<'a, Message> Widget<Message> for Text {
     fn node<'b>(
-- 
cgit 


From b9e0f7494881ad7cdfbcbc16878ecc6ef717753f Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Fri, 20 Sep 2019 19:15:31 +0200
Subject: Create `iced_core` and `iced_native`

---
 web/src/widget/text.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/src/widget/text.rs')

diff --git a/web/src/widget/text.rs b/web/src/widget/text.rs
index a5709775..ef9170ef 100644
--- a/web/src/widget/text.rs
+++ b/web/src/widget/text.rs
@@ -1,7 +1,7 @@
 use crate::{Bus, Element, Widget};
 use dodrio::bumpalo;
 
-pub use iced::text::*;
+pub use iced_core::text::*;
 
 impl<'a, Message> Widget<Message> for Text {
     fn node<'b>(
-- 
cgit 


From 86dede4c4cc2bca9be7d2e6bd831daa98bd7043d Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sat, 21 Sep 2019 13:38:14 +0200
Subject: Make example work on web and update READMEs

---
 web/src/widget/text.rs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'web/src/widget/text.rs')

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())])
-- 
cgit