Parent transform

src/elements/div.rs

@@ -11,34 +11,45 @@ pub struct DivRenderer<'a>(pub &'a mut RawTransform);
 
 pub struct Div {
     children: Vec<Arc<Widget>>,
+    render: (u16, u16),
 }
 
 impl Div {
     pub fn new() -> Self {
         Div {
             children: Vec::new(),
+            render: (0, 0),
         }
     }
 }
 
 impl Element for Div {
     fn render(
+        &mut self,
+        scope: &mut crate::prelude::RenderScope,
+        _: &crate::render_scope::RenderContext,
+    ) {
+        scope.use_area(self.render.0, self.render.1);
+    }
+
+    fn after_render(
         &mut self,
         parent_scope: &mut crate::render_scope::RenderScope,
         render_context: &crate::render_scope::RenderContext,
     ) {
         let mut transform = parent_scope.get_transform().clone();
-        let (w, h) = parent_scope.get_size_or_parent();
+        let mut transform2 = transform.clone();
+        (transform2.width, transform2.height) = parent_scope.get_size_or_parent();
 
         let mut scope = crate::render_scope::RenderScope::new();
-        scope.set_parent_size(w, h);
+        scope.set_parent_transform(transform2.clone());
 
         let mut renderer = DivRenderer(&mut transform);
         for widget in &self.children {
             scope.render_widget(&mut renderer, render_context.get_context(), widget);
         }
 
-        parent_scope.use_area(w, h);
+        self.render = (transform2.width, transform2.height);
     }
 
     fn draw_child(&mut self, element: &Arc<Widget>) {

src/elements/flex.rs

@@ -13,11 +13,13 @@ pub struct ColumnRenderer<'a>(&'a mut RawTransform, u16, &'a mut u16);
 pub struct FlexRow {
     pub gap: u16,
     children: Vec<Arc<Widget>>,
+    render: (u16, u16),
 }
 
 pub struct FlexCol {
     pub gap: u16,
     children: Vec<Arc<Widget>>,
+    render: (u16, u16),
 }
 
 impl FlexRow {
@@ -25,6 +27,7 @@ impl FlexRow {
         Self {
             children: Vec::new(),
             gap: 0,
+            render: (0, 0),
         }
     }
 }
@@ -34,21 +37,31 @@ impl FlexCol {
         Self {
             children: Vec::new(),
             gap: 0,
+            render: (0, 0),
         }
     }
 }
 
 impl Element for FlexRow {
     fn render(
+        &mut self,
+        scope: &mut crate::prelude::RenderScope,
+        _: &crate::render_scope::RenderContext,
+    ) {
+        scope.use_area(self.render.0, self.render.1);
+    }
+
+    fn after_render(
         &mut self,
         parent_scope: &mut crate::render_scope::RenderScope,
         render_context: &crate::render_scope::RenderContext,
     ) {
         let mut transform = parent_scope.get_transform().clone();
-        let (w, h) = parent_scope.get_size_or_parent();
+        let mut transform2 = transform.clone();
+        (transform2.width, transform2.height) = parent_scope.get_size_or_parent();
 
         let mut scope = crate::render_scope::RenderScope::new();
-        scope.set_parent_size(w, h);
+        scope.set_parent_transform(transform2.clone());
 
         let mut v = 0;
         let mut renderer = RowRenderer(&mut transform, self.gap, &mut v);
@@ -56,7 +69,7 @@ impl Element for FlexRow {
             scope.render_widget(&mut renderer, render_context.get_context(), widget);
         }
 
-        parent_scope.use_area(w, h);
+        self.render = (transform2.width, transform2.height);
     }
 
     fn draw_child(&mut self, element: &Arc<Widget>) {
@@ -85,15 +98,24 @@ impl Element for FlexRow {
 
 impl Element for FlexCol {
     fn render(
+        &mut self,
+        scope: &mut crate::prelude::RenderScope,
+        _: &crate::render_scope::RenderContext,
+    ) {
+        scope.use_area(self.render.0, self.render.1);
+    }
+
+    fn after_render(
         &mut self,
         parent_scope: &mut crate::render_scope::RenderScope,
         render_context: &crate::render_scope::RenderContext,
     ) {
         let mut transform = parent_scope.get_transform().clone();
-        let (w, h) = parent_scope.get_size_or_parent();
+        let mut transform2 = transform.clone();
+        (transform2.width, transform2.height) = parent_scope.get_size_or_parent();
 
         let mut scope = crate::render_scope::RenderScope::new();
-        scope.set_parent_size(w, h);
+        scope.set_parent_transform(transform2.clone());
 
         let mut v = 0;
         let mut renderer = ColumnRenderer(&mut transform, self.gap, &mut v);
@@ -101,7 +123,7 @@ impl Element for FlexCol {
             scope.render_widget(&mut renderer, render_context.get_context(), widget);
         }
 
-        parent_scope.use_area(w, h);
+        self.render = (transform2.width, transform2.height);
     }
 
     fn draw_child(&mut self, element: &Arc<Widget>) {

src/elements/paginator.rs

@@ -30,15 +30,16 @@ impl Element for Paginator {
     ) {
         if let Some(widget) = self.children.get(self.index) {
             let mut transform = parent_scope.get_transform().clone();
-            let (w, h) = parent_scope.get_size_or_parent();
+            let mut transform2 = transform.clone();
+            (transform2.width, transform2.height) = parent_scope.get_size_or_parent();
 
             let mut scope = crate::render_scope::RenderScope::new();
-            scope.set_parent_size(w, h);
+            scope.set_parent_transform(transform2.clone());
 
             let mut renderer = DivRenderer(&mut transform);
             scope.render_widget(&mut renderer, render_context.get_context(), widget);
 
-            parent_scope.use_area(w, h);
+            parent_scope.use_area(transform2.width, transform2.height);
         }
     }