refactored div

src/elements/div.rs

@@ -1,67 +1,47 @@
 use std::sync::{Arc, Mutex};
 
-use crate::{
-    extensions::Handler,
-    widget::{Element, Widget},
-    RenderWrapperEvent,
-};
+use crate::widget::{Element, Widget};
 
 pub struct Div {
     color: u32,
-    children: Mutex<usize>,
-    rendered: Mutex<usize>,
+    children: Mutex<Vec<Arc<Widget>>>,
 }
 
 impl Element for Arc<Div> {
     fn render(&mut self, scope: &mut crate::render_scope::RenderScope) {
-        let (w, h) = scope.get_size_or_parent();
-        scope.draw_rect(w, h, self.color);
+        let (width, height) = scope.get_size_or_parent();
+        scope.draw_rect(width, height, self.color);
+    }
+
+    fn after_render(&mut self, scope: &mut crate::render_scope::RenderScope) {
+        let transform = scope.get_transform().clone();
+
+        scope.draw();
+        let (w, h) = scope.get_parent_size();
+        scope.set_parent_size(transform.width, transform.height);
+
+        for elem in self.children.lock().unwrap().iter() {
+            scope.clear();
+            if let Some(t) = elem.get() {
+                scope.set_transform(&t);
+            }
+            elem.0.lock().unwrap().render(scope);
+            if let Some(t) = elem.get() {
+                scope.set_transform(&t);
+            }
+            let t = scope.get_transform_mut();
+            t.x += transform.x;
+            t.y += transform.y;
+
+            scope.draw();
+            elem.0.lock().unwrap().after_render(scope);
+            scope.clear();
+        }
+        scope.set_parent_size(w, h);
     }
 
     fn draw_child(&self, element: &Arc<Widget>) {
-        *self.children.lock().unwrap() += 1;
-        let r = self.clone();
-        element.inject(move |w| {
-            let r = r.clone();
-            w.component(Handler::new(move |elem, e: &RenderWrapperEvent| {
-                let scope = e.get_scope();
-                let transform = scope.get_transform().clone();
-
-                scope.clear();
-                let (w, h) = scope.get_parent_size();
-                scope.set_parent_size(transform.width, transform.height);
-
-                if let Some(t) = elem.get() {
-                    scope.set_transform(&t);
-                }
-
-                elem.0.lock().unwrap().render(scope);
-
-                if let Some(t) = elem.get() {
-                    scope.set_transform(&t);
-                }
-
-                let elem_transform = scope.get_transform_mut();
-                elem_transform.x += transform.x;
-                elem_transform.y += transform.y;
-
-                scope.draw();
-                elem.0.lock().unwrap().after_render(&scope);
-
-                scope.set_parent_size(w, h);
-
-                {
-                    let mut rendered = r.rendered.lock().unwrap();
-                    let children = r.children.lock().unwrap();
-                    *rendered += 1;
-                    if *rendered < *children {
-                        scope.set_transform_raw(transform);
-                    } else {
-                        *rendered = 0;
-                    }
-                }
-            }))
-        })
+        self.children.lock().unwrap().push(element.clone());
     }
 
     fn as_any(&self) -> &dyn std::any::Any {
@@ -77,8 +57,7 @@ impl Div {
     pub fn new(color: u32) -> Arc<Self> {
         Arc::new(Div {
             color,
-            children: Mutex::new(0),
-            rendered: Mutex::new(0),
+            children: Mutex::new(Vec::new()),
         })
     }
 }