Widget injection

src/elements/div.rs

@@ -24,7 +24,9 @@ impl Element for Arc<Div> {
 
     fn draw_child(&self, element: &Arc<Widget>) {
         let r = self.clone();
-        element.component(Handler::new(move |elem, e: &RenderWrapperEvent| {
+        element.inject(move |w| {
+            let r = r.clone();
+            w.component(Handler::new(move |elem, e: &RenderWrapperEvent| {
                 let scope = e.get_scope();
                 scope.clear();
 
@@ -51,7 +53,8 @@ impl Element for Arc<Div> {
                 elem.0.lock().unwrap().after_render(&scope);
 
                 scope.set_parent_size(w, h);
-        }));
+            }))
+        })
     }
 
     fn as_any(&self) -> &dyn std::any::Any {

src/elements/grid.rs

@@ -38,7 +38,9 @@ impl Element for Arc<VGrid> {
 
     fn draw_child(&self, element: &Arc<Widget>) {
         let r = self.clone();
-        element.component(Handler::new(move |elem, e: &RenderWrapperEvent| {
+        element.inject(move |w| {
+            let r = r.clone();
+            w.component(Handler::new(move |elem, e: &RenderWrapperEvent| {
                 let scope = e.get_scope();
                 scope.clear();
 
@@ -74,7 +76,8 @@ impl Element for Arc<VGrid> {
                 elem.0.lock().unwrap().after_render(&scope);
 
                 scope.set_parent_size(w, h);
-        }));
+            }))
+        })
     }
 
     fn as_any(&self) -> &dyn std::any::Any {
@@ -116,7 +119,9 @@ impl Element for Arc<HGrid> {
 
     fn draw_child(&self, element: &Arc<Widget>) {
         let r = self.clone();
-        element.component(Handler::new(move |elem, e: &RenderWrapperEvent| {
+        element.inject(move |w| {
+            let r = r.clone();
+            w.component(Handler::new(move |elem, e: &RenderWrapperEvent| {
                 let scope = e.get_scope();
                 scope.clear();
 
@@ -152,7 +157,8 @@ impl Element for Arc<HGrid> {
                 elem.0.lock().unwrap().after_render(&scope);
 
                 scope.set_parent_size(w, h);
-        }));
+            }))
+        });
     }
 
     fn as_any(&self) -> &dyn std::any::Any {

src/lib.rs

@@ -105,10 +105,10 @@ impl Screen {
                 scope.draw();
 
                 elem.0.lock().unwrap().after_render(&scope);
+            }
 
             elem.auto_refresh();
         }
-        }
         Ok(())
     }
 }

src/widget.rs

@@ -30,6 +30,7 @@ pub struct Widget(
     Mutex<HashMap<TypeId, BoxedComponent>>,
     Mutex<Box<dyn FnMut() -> WidgetLoad + Send + Sync>>,
     Mutex<Vec<Box<dyn DependencyHandler>>>,
+    Mutex<Option<Box<dyn FnMut(WidgetLoad) -> WidgetLoad + Send + Sync>>>,
 );
 
 impl Widget {
@@ -40,14 +41,34 @@ impl Widget {
             Mutex::new(wl.1),
             Mutex::new(Box::new(e)),
             Mutex::new(Vec::new()),
+            Mutex::new(None),
         )
     }
 
+    pub fn inject<F: FnMut(WidgetLoad) -> WidgetLoad + 'static + Send + Sync>(
+        self: &Arc<Self>,
+        f: F,
+    ) {
+        {
+            *self.4.lock().unwrap() = Some(Box::new(f));
+        }
+        self.refresh();
+    }
+
     pub fn refresh(self: &Arc<Self>) {
         let w = (self.2.lock().unwrap())();
+        match &mut *self.4.lock().unwrap() {
+            Some(inject) => {
+                let w = inject(w);
                 *self.0.lock().unwrap() = w.0;
                 *self.1.lock().unwrap() = w.1;
             }
+            None => {
+                *self.0.lock().unwrap() = w.0;
+                *self.1.lock().unwrap() = w.1;
+            }
+        }
+    }
 
     pub fn auto_refresh(self: &Arc<Self>) {
         for d in self.3.lock().unwrap().iter() {