Add `Renderer` argument to `operate`

14 files changed, 42 insertions, 8 deletions

diff --git a/native/src/element.rs b/native/src/element.rs
index 2f1adeff..2409b1c9 100644
--- a/native/src/element.rs
+++ b/native/src/element.rs
@@ -290,6 +290,7 @@ where
         &self,
         tree: &mut Tree,
         layout: Layout<'_>,
+        renderer: &Renderer,
         operation: &mut dyn widget::Operation<B>,
     ) {
         struct MapOperation<'a, B> {
@@ -334,8 +335,12 @@ where
             }
         }
 
-        self.widget
-            .operate(tree, layout, &mut MapOperation { operation });
+        self.widget.operate(
+            tree,
+            layout,
+            renderer,
+            &mut MapOperation { operation },
+        );
     }
 
     fn on_event(
@@ -473,9 +478,12 @@ where
         &self,
         state: &mut Tree,
         layout: Layout<'_>,
+        renderer: &Renderer,
         operation: &mut dyn widget::Operation<Message>,
     ) {
-        self.element.widget.operate(state, layout, operation)
+        self.element
+            .widget
+            .operate(state, layout, renderer, operation)
     }
 
     fn on_event(
diff --git a/native/src/overlay.rs b/native/src/overlay.rs
index 0b05b058..22f8b6ec 100644
--- a/native/src/overlay.rs
+++ b/native/src/overlay.rs
@@ -46,6 +46,7 @@ where
     fn operate(
         &mut self,
         _layout: Layout<'_>,
+        _renderer: &Renderer,
         _operation: &mut dyn widget::Operation<Message>,
     ) {
     }
diff --git a/native/src/overlay/element.rs b/native/src/overlay/element.rs
index 4f5ef32a..498e9ae3 100644
--- a/native/src/overlay/element.rs
+++ b/native/src/overlay/element.rs
@@ -108,9 +108,10 @@ where
     pub fn operate(
         &mut self,
         layout: Layout<'_>,
+        renderer: &Renderer,
         operation: &mut dyn widget::Operation<Message>,
     ) {
-        self.overlay.operate(layout, operation);
+        self.overlay.operate(layout, renderer, operation);
     }
 }
 
@@ -144,6 +145,7 @@ where
     fn operate(
         &mut self,
         layout: Layout<'_>,
+        renderer: &Renderer,
         operation: &mut dyn widget::Operation<B>,
     ) {
         struct MapOperation<'a, B> {
@@ -189,7 +191,7 @@ where
         }
 
         self.content
-            .operate(layout, &mut MapOperation { operation });
+            .operate(layout, renderer, &mut MapOperation { operation });
     }
 
     fn on_event(
diff --git a/native/src/user_interface.rs b/native/src/user_interface.rs
index 376ce568..2b43829d 100644
--- a/native/src/user_interface.rs
+++ b/native/src/user_interface.rs
@@ -493,6 +493,7 @@ where
         self.root.as_widget().operate(
             &mut self.state,
             Layout::new(&self.base),
+            renderer,
             operation,
         );
 
@@ -507,6 +508,7 @@ where
 
             overlay.operate(
                 Layout::new(self.overlay.as_ref().unwrap()),
+                renderer,
                 operation,
             );
         }
diff --git a/native/src/widget.rs b/native/src/widget.rs
index efe26fc7..f714e28a 100644
--- a/native/src/widget.rs
+++ b/native/src/widget.rs
@@ -175,6 +175,7 @@ where
         &self,
         _state: &mut Tree,
         _layout: Layout<'_>,
+        _renderer: &Renderer,
         _operation: &mut dyn Operation<Message>,
     ) {
     }
diff --git a/native/src/widget/button.rs b/native/src/widget/button.rs
index bbd9451c..b4276317 100644
--- a/native/src/widget/button.rs
+++ b/native/src/widget/button.rs
@@ -169,12 +169,14 @@ where
         &self,
         tree: &mut Tree,
         layout: Layout<'_>,
+        renderer: &Renderer,
         operation: &mut dyn Operation<Message>,
     ) {
         operation.container(None, &mut |operation| {
             self.content.as_widget().operate(
                 &mut tree.children[0],
                 layout.children().next().unwrap(),
+                renderer,
                 operation,
             );
         });
diff --git a/native/src/widget/column.rs b/native/src/widget/column.rs
index 8030778b..f2ef132a 100644
--- a/native/src/widget/column.rs
+++ b/native/src/widget/column.rs
@@ -147,6 +147,7 @@ where
         &self,
         tree: &mut Tree,
         layout: Layout<'_>,
+        renderer: &Renderer,
         operation: &mut dyn Operation<Message>,
     ) {
         operation.container(None, &mut |operation| {
@@ -155,7 +156,9 @@ where
                 .zip(&mut tree.children)
                 .zip(layout.children())
                 .for_each(|((child, state), layout)| {
-                    child.as_widget().operate(state, layout, operation);
+                    child
+                        .as_widget()
+                        .operate(state, layout, renderer, operation);
                 })
         });
     }
diff --git a/native/src/widget/container.rs b/native/src/widget/container.rs
index 16d0cb61..cdf1c859 100644
--- a/native/src/widget/container.rs
+++ b/native/src/widget/container.rs
@@ -169,12 +169,14 @@ where
         &self,
         tree: &mut Tree,
         layout: Layout<'_>,
+        renderer: &Renderer,
         operation: &mut dyn Operation<Message>,
     ) {
         operation.container(None, &mut |operation| {
             self.content.as_widget().operate(
                 &mut tree.children[0],
                 layout.children().next().unwrap(),
+                renderer,
                 operation,
             );
         });
diff --git a/native/src/widget/pane_grid.rs b/native/src/widget/pane_grid.rs
index 61597921..f8dbab74 100644
--- a/native/src/widget/pane_grid.rs
+++ b/native/src/widget/pane_grid.rs
@@ -294,6 +294,7 @@ where
         &self,
         tree: &mut Tree,
         layout: Layout<'_>,
+        renderer: &Renderer,
         operation: &mut dyn widget::Operation<Message>,
     ) {
         operation.container(None, &mut |operation| {
@@ -302,7 +303,7 @@ where
                 .zip(&mut tree.children)
                 .zip(layout.children())
                 .for_each(|(((_pane, content), state), layout)| {
-                    content.operate(state, layout, operation);
+                    content.operate(state, layout, renderer, operation);
                 })
         });
     }
diff --git a/native/src/widget/pane_grid/content.rs b/native/src/widget/pane_grid/content.rs
index 5f269d1f..c9b0df07 100644
--- a/native/src/widget/pane_grid/content.rs
+++ b/native/src/widget/pane_grid/content.rs
@@ -187,6 +187,7 @@ where
         &self,
         tree: &mut Tree,
         layout: Layout<'_>,
+        renderer: &Renderer,
         operation: &mut dyn widget::Operation<Message>,
     ) {
         let body_layout = if let Some(title_bar) = &self.title_bar {
@@ -195,6 +196,7 @@ where
             title_bar.operate(
                 &mut tree.children[1],
                 children.next().unwrap(),
+                renderer,
                 operation,
             );
 
@@ -206,6 +208,7 @@ where
         self.body.as_widget().operate(
             &mut tree.children[0],
             body_layout,
+            renderer,
             operation,
         );
     }
diff --git a/native/src/widget/pane_grid/title_bar.rs b/native/src/widget/pane_grid/title_bar.rs
index 28e4670f..ea0969aa 100644
--- a/native/src/widget/pane_grid/title_bar.rs
+++ b/native/src/widget/pane_grid/title_bar.rs
@@ -261,6 +261,7 @@ where
         &self,
         tree: &mut Tree,
         layout: Layout<'_>,
+        renderer: &Renderer,
         operation: &mut dyn widget::Operation<Message>,
     ) {
         let mut children = layout.children();
@@ -282,6 +283,7 @@ where
             controls.as_widget().operate(
                 &mut tree.children[1],
                 controls_layout,
+                renderer,
                 operation,
             )
         };
@@ -290,6 +292,7 @@ where
             self.content.as_widget().operate(
                 &mut tree.children[0],
                 title_layout,
+                renderer,
                 operation,
             )
         }
diff --git a/native/src/widget/row.rs b/native/src/widget/row.rs
index c689ac13..108e98e4 100644
--- a/native/src/widget/row.rs
+++ b/native/src/widget/row.rs
@@ -134,6 +134,7 @@ where
         &self,
         tree: &mut Tree,
         layout: Layout<'_>,
+        renderer: &Renderer,
         operation: &mut dyn Operation<Message>,
     ) {
         operation.container(None, &mut |operation| {
@@ -142,7 +143,9 @@ where
                 .zip(&mut tree.children)
                 .zip(layout.children())
                 .for_each(|((child, state), layout)| {
-                    child.as_widget().operate(state, layout, operation);
+                    child
+                        .as_widget()
+                        .operate(state, layout, renderer, operation);
                 })
         });
     }
diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs
index 1af0a6ab..20780f89 100644
--- a/native/src/widget/scrollable.rs
+++ b/native/src/widget/scrollable.rs
@@ -164,6 +164,7 @@ where
         &self,
         tree: &mut Tree,
         layout: Layout<'_>,
+        renderer: &Renderer,
         operation: &mut dyn Operation<Message>,
     ) {
         let state = tree.state.downcast_mut::<State>();
@@ -174,6 +175,7 @@ where
             self.content.as_widget().operate(
                 &mut tree.children[0],
                 layout.children().next().unwrap(),
+                renderer,
                 operation,
             );
         });
diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs
index 9391d1dd..05b47ff9 100644
--- a/native/src/widget/text_input.rs
+++ b/native/src/widget/text_input.rs
@@ -228,6 +228,7 @@ where
         &self,
         tree: &mut Tree,
         _layout: Layout<'_>,
+        _renderer: &Renderer,
         operation: &mut dyn Operation<Message>,
     ) {
         let state = tree.state.downcast_mut::<State>();