working divs

src/elements/div.rs

@@ -1,13 +1,27 @@
-use std::sync::Arc;
+use std::sync::{Arc, Mutex};
 
-use crate::widget::{Element, Widget};
+use crate::{
+    extensions::Handler,
+    style::RawTransform,
+    widget::{Element, Widget},
+    RenderWrapperEvent,
+};
 
-#[derive(Default)]
 pub struct Div {
-    pub children: Vec<Arc<Widget>>,
+    transform: Mutex<RawTransform>,
+    color: u32,
 }
 
-impl Element for Div {
+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);
+    }
+
+    fn after_render(&mut self, scope: &crate::render_scope::RenderScope) {
+        *self.transform.lock().unwrap() = scope.get_transform().clone();
+    }
+
     fn as_any(&self) -> &dyn std::any::Any {
         self
     }
@@ -18,14 +32,44 @@ impl Element for Div {
 }
 
 impl Div {
-    pub fn new() -> Self {
-        Div {
-            children: Vec::new(),
-        }
+    pub fn new(color: u32) -> Arc<Self> {
+        Arc::new(Div {
+            transform: Mutex::new(RawTransform::new()),
+            color,
+        })
     }
 
-    pub fn draw<E: Element + 'static>(&mut self, element: E) -> &Arc<Widget> {
-        self.children.push(Arc::new(Widget::new(Box::new(element))));
-        self.children.last().unwrap()
+    pub fn draw(self: &Arc<Self>, element: &Arc<Widget>) -> Arc<Self> {
+        let r2 = self.clone();
+        let r = self.clone();
+        element.component(Handler::new(move |elem, e: &RenderWrapperEvent| {
+            let scope = e.get_scope();
+            scope.clear();
+
+            let transform = r2.transform.lock().unwrap();
+
+            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);
+        }));
+        r
     }
 }