Merge pull request #1615 from iced-rs/fix/responsive-operations

hecrj · web-flow · commit a6d0d5773f05 · 2022-12-22T15:03:23.000+01:00
Fix operations for `Responsive` widget
diff --git a/examples/modal/src/main.rs b/examples/modal/src/main.rs
@@ -325,11 +325,13 @@ mod modal {
             &self,
             state: &mut Tree,
             layout: Layout<'_>,
+            renderer: &Renderer,
             operation: &mut dyn widget::Operation<Message>,
         ) {
             self.base.as_widget().operate(
                 &mut state.children[0],
                 layout,
+                renderer,
                 operation,
             );
         }
@@ -436,11 +438,13 @@ mod modal {
         fn operate(
             &mut self,
             layout: Layout<'_>,
+            renderer: &Renderer,
             operation: &mut dyn widget::Operation<Message>,
         ) {
             self.content.as_widget().operate(
                 self.tree,
                 layout.children().next().unwrap(),
+                renderer,
                 operation,
             );
         }
diff --git a/lazy/src/component.rs b/lazy/src/component.rs
@@ -234,6 +234,7 @@ where
         &self,
         tree: &mut Tree,
         layout: Layout<'_>,
+        renderer: &Renderer,
         operation: &mut dyn widget::Operation<Message>,
     ) {
         struct MapOperation<'a, B> {
@@ -274,6 +275,7 @@ where
             element.as_widget().operate(
                 &mut tree.children[0],
                 layout,
+                renderer,
                 &mut MapOperation { operation },
             );
         });
diff --git a/lazy/src/lazy.rs b/lazy/src/lazy.rs
@@ -130,12 +130,14 @@ where
         &self,
         tree: &mut Tree,
         layout: Layout<'_>,
+        renderer: &Renderer,
         operation: &mut dyn widget::Operation<Message>,
     ) {
         self.with_element(|element| {
             element.as_widget().operate(
                 &mut tree.children[0],
                 layout,
+                renderer,
                 operation,
             );
         });
diff --git a/lazy/src/responsive.rs b/lazy/src/responsive.rs
@@ -3,8 +3,8 @@ use iced_native::layout::{self, Layout};
 use iced_native::mouse;
 use iced_native::overlay;
 use iced_native::renderer;
-use iced_native::widget::horizontal_space;
 use iced_native::widget::tree::{self, Tree};
+use iced_native::widget::{self, horizontal_space};
 use iced_native::{
     Clipboard, Element, Length, Point, Rectangle, Shell, Size, Widget,
 };
@@ -142,6 +142,29 @@ where
         layout::Node::new(limits.max())
     }
 
+    fn operate(
+        &self,
+        tree: &mut Tree,
+        layout: Layout<'_>,
+        renderer: &Renderer,
+        operation: &mut dyn widget::Operation<Message>,
+    ) {
+        let state = tree.state.downcast_mut::<State>();
+        let mut content = self.content.borrow_mut();
+
+        content.resolve(
+            &mut state.tree.borrow_mut(),
+            renderer,
+            layout,
+            &self.view,
+            |tree, renderer, layout, element| {
+                element
+                    .as_widget()
+                    .operate(tree, layout, renderer, operation);
+            },
+        );
+    }
+
     fn on_event(
         &mut self,
         tree: &mut Tree,
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>();

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ where`
`46`	`46`	`fn operate(`
`47`	`47`	`&mut self,`
`48`	`48`	`_layout: Layout<'_>,`
	`49`	`+ _renderer: &Renderer,`
`49`	`50`	`_operation: &mut dyn widget::Operation<Message>,`
`50`	`51`	`) {`
`51`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,9 +108,10 @@ where`
`108`	`108`	`pub fn operate(`
`109`	`109`	`&mut self,`
`110`	`110`	`layout: Layout<'_>,`
	`111`	`+ renderer: &Renderer,`
`111`	`112`	`operation: &mut dyn widget::Operation<Message>,`
`112`	`113`	`) {`
`113`		`- self.overlay.operate(layout, operation);`
	`114`	`+ self.overlay.operate(layout, renderer, operation);`
`114`	`115`	`}`
`115`	`116`	`}`
`116`	`117`
`@@ -144,6 +145,7 @@ where`
`144`	`145`	`fn operate(`
`145`	`146`	`&mut self,`
`146`	`147`	`layout: Layout<'_>,`
	`148`	`+ renderer: &Renderer,`
`147`	`149`	`operation: &mut dyn widget::Operation<B>,`
`148`	`150`	`) {`
`149`	`151`	`struct MapOperation<'a, B> {`
`@@ -189,7 +191,7 @@ where`
`189`	`191`	`}`
`190`	`192`
`191`	`193`	`self.content`
`192`		`- .operate(layout, &mut MapOperation { operation });`
	`194`	`+ .operate(layout, renderer, &mut MapOperation { operation });`
`193`	`195`	`}`
`194`	`196`
`195`	`197`	`fn on_event(`
Original file line number	Diff line number	Diff line change
`@@ -175,6 +175,7 @@ where`
`175`	`175`	`&self,`
`176`	`176`	`_state: &mut Tree,`
`177`	`177`	`_layout: Layout<'_>,`
	`178`	`+ _renderer: &Renderer,`
`178`	`179`	`_operation: &mut dyn Operation<Message>,`
`179`	`180`	`) {`
`180`	`181`	`}`