From 53f382043235d7ab9eae9b0882de3e8c77cc0d40 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sun, 13 Feb 2022 22:13:47 +0700
Subject: Implement `Radio` in `iced_pure`

---
 pure/src/widget/radio.rs | 125 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 125 insertions(+)
 create mode 100644 pure/src/widget/radio.rs

(limited to 'pure/src/widget/radio.rs')

diff --git a/pure/src/widget/radio.rs b/pure/src/widget/radio.rs
new file mode 100644
index 00000000..25fe5bdd
--- /dev/null
+++ b/pure/src/widget/radio.rs
@@ -0,0 +1,125 @@
+use crate::{Element, Tree, Widget};
+
+use iced_native::event::{self, Event};
+use iced_native::layout::{self, Layout};
+use iced_native::mouse;
+use iced_native::renderer;
+use iced_native::text;
+use iced_native::{Clipboard, Hasher, Length, Point, Rectangle, Shell};
+
+use std::any::{self, Any};
+
+pub use iced_native::widget::Radio;
+
+impl<'a, Message, Renderer> Widget<Message, Renderer>
+    for Radio<'a, Message, Renderer>
+where
+    Message: Clone,
+    Renderer: text::Renderer,
+{
+    fn tag(&self) -> any::TypeId {
+        any::TypeId::of::<()>()
+    }
+
+    fn state(&self) -> Box<dyn Any> {
+        Box::new(())
+    }
+
+    fn diff(&self, _tree: &mut Tree) {}
+
+    fn children_state(&self) -> Vec<Tree> {
+        Vec::new()
+    }
+
+    fn width(&self) -> Length {
+        <Self as iced_native::Widget<Message, Renderer>>::width(self)
+    }
+
+    fn height(&self) -> Length {
+        <Self as iced_native::Widget<Message, Renderer>>::height(self)
+    }
+
+    fn layout(
+        &self,
+        renderer: &Renderer,
+        limits: &layout::Limits,
+    ) -> layout::Node {
+        <Self as iced_native::Widget<Message, Renderer>>::layout(
+            self, renderer, limits,
+        )
+    }
+
+    fn on_event(
+        &mut self,
+        _state: &mut Tree,
+        event: Event,
+        layout: Layout<'_>,
+        cursor_position: Point,
+        renderer: &Renderer,
+        clipboard: &mut dyn Clipboard,
+        shell: &mut Shell<'_, Message>,
+    ) -> event::Status {
+        <Self as iced_native::Widget<Message, Renderer>>::on_event(
+            self,
+            event,
+            layout,
+            cursor_position,
+            renderer,
+            clipboard,
+            shell,
+        )
+    }
+
+    fn draw(
+        &self,
+        _tree: &Tree,
+        renderer: &mut Renderer,
+        style: &renderer::Style,
+        layout: Layout<'_>,
+        cursor_position: Point,
+        viewport: &Rectangle,
+    ) {
+        <Self as iced_native::Widget<Message, Renderer>>::draw(
+            self,
+            renderer,
+            style,
+            layout,
+            cursor_position,
+            viewport,
+        )
+    }
+
+    fn mouse_interaction(
+        &self,
+        _state: &Tree,
+        layout: Layout<'_>,
+        cursor_position: Point,
+        viewport: &Rectangle,
+        renderer: &Renderer,
+    ) -> mouse::Interaction {
+        <Self as iced_native::Widget<Message, Renderer>>::mouse_interaction(
+            self,
+            layout,
+            cursor_position,
+            viewport,
+            renderer,
+        )
+    }
+
+    fn hash_layout(&self, state: &mut Hasher) {
+        <Self as iced_native::Widget<Message, Renderer>>::hash_layout(
+            self, state,
+        )
+    }
+}
+
+impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
+    for Radio<'a, Message, Renderer>
+where
+    Message: 'a + Clone,
+    Renderer: text::Renderer + 'a,
+{
+    fn into(self) -> Element<'a, Message, Renderer> {
+        Element::new(self)
+    }
+}
-- 
cgit 


From 35e9b75e415ef3b9124051696b60628ef56afe47 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 16 Feb 2022 15:44:50 +0700
Subject: Introduce `Tag` and `State` opaque types in `iced_pure::widget::tree`

---
 pure/src/widget/radio.rs | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'pure/src/widget/radio.rs')

diff --git a/pure/src/widget/radio.rs b/pure/src/widget/radio.rs
index 25fe5bdd..233297b3 100644
--- a/pure/src/widget/radio.rs
+++ b/pure/src/widget/radio.rs
@@ -7,8 +7,6 @@ use iced_native::renderer;
 use iced_native::text;
 use iced_native::{Clipboard, Hasher, Length, Point, Rectangle, Shell};
 
-use std::any::{self, Any};
-
 pub use iced_native::widget::Radio;
 
 impl<'a, Message, Renderer> Widget<Message, Renderer>
@@ -17,20 +15,6 @@ where
     Message: Clone,
     Renderer: text::Renderer,
 {
-    fn tag(&self) -> any::TypeId {
-        any::TypeId::of::<()>()
-    }
-
-    fn state(&self) -> Box<dyn Any> {
-        Box::new(())
-    }
-
-    fn diff(&self, _tree: &mut Tree) {}
-
-    fn children_state(&self) -> Vec<Tree> {
-        Vec::new()
-    }
-
     fn width(&self) -> Length {
         <Self as iced_native::Widget<Message, Renderer>>::width(self)
     }
-- 
cgit 


From d7100fd2597da82d97eaf196d50573ea64f3f8ff Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 16 Mar 2022 17:37:19 +0700
Subject: Export widget modules in `iced_pure`

... and fix collisions with the new `helpers`
---
 pure/src/widget/radio.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'pure/src/widget/radio.rs')

diff --git a/pure/src/widget/radio.rs b/pure/src/widget/radio.rs
index ce3ede84..c20f8f3e 100644
--- a/pure/src/widget/radio.rs
+++ b/pure/src/widget/radio.rs
@@ -1,4 +1,5 @@
-use crate::{Element, Tree, Widget};
+use crate::widget::Tree;
+use crate::{Element, Widget};
 
 use iced_native::event::{self, Event};
 use iced_native::layout::{self, Layout};
@@ -7,7 +8,7 @@ use iced_native::renderer;
 use iced_native::text;
 use iced_native::{Clipboard, Length, Point, Rectangle, Shell};
 
-pub use iced_native::widget::Radio;
+pub use iced_native::widget::radio::{Radio, Style, StyleSheet};
 
 impl<'a, Message, Renderer> Widget<Message, Renderer>
     for Radio<'a, Message, Renderer>
-- 
cgit