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/button.rs | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

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

diff --git a/pure/src/widget/button.rs b/pure/src/widget/button.rs
index 6dc1016c..55cbf8b4 100644
--- a/pure/src/widget/button.rs
+++ b/pure/src/widget/button.rs
@@ -1,4 +1,5 @@
-use crate::widget::{Element, Tree, Widget};
+use crate::widget::tree::{self, Tree};
+use crate::widget::{Element, Widget};
 
 use iced_native::event::{self, Event};
 use iced_native::layout;
@@ -10,8 +11,6 @@ use iced_native::{
 };
 use iced_style::button::StyleSheet;
 
-use std::any::Any;
-
 pub use button::State;
 
 pub struct Button<'a, Message, Renderer> {
@@ -77,20 +76,20 @@ where
     Message: 'static + Clone,
     Renderer: 'static + iced_native::Renderer,
 {
-    fn tag(&self) -> std::any::TypeId {
-        std::any::TypeId::of::<State>()
+    fn tag(&self) -> tree::Tag {
+        tree::Tag::of::<State>()
     }
 
-    fn state(&self) -> Box<dyn Any> {
-        Box::new(State::new())
+    fn state(&self) -> tree::State {
+        tree::State::new(State::new())
     }
 
-    fn diff(&self, tree: &mut Tree) {
-        tree.diff_children(std::slice::from_ref(&self.content))
+    fn children(&self) -> Vec<Tree> {
+        vec![Tree::new(&self.content)]
     }
 
-    fn children_state(&self) -> Vec<Tree> {
-        vec![Tree::new(&self.content)]
+    fn diff(&self, tree: &mut Tree) {
+        tree.diff_children(std::slice::from_ref(&self.content))
     }
 
     fn width(&self) -> Length {
-- 
cgit