Take Event by reference in Widget::update

iced-rs · Feb 4, 2025 · afef368 · afef368
1 parent 1b01d67
commit afef368
Show file tree

Hide file tree

Showing 49 changed files with 111 additions and 155 deletions.
diff --git a/core/src/element.rs b/core/src/element.rs
@@ -311,7 +311,7 @@ where
     fn update(
         &mut self,
         tree: &mut Tree,
-        event: Event,
+        event: &Event,
         layout: Layout<'_>,
         cursor: mouse::Cursor,
         renderer: &Renderer,
@@ -447,7 +447,7 @@ where
     fn update(
         &mut self,
         state: &mut Tree,
-        event: Event,
+        event: &Event,
         layout: Layout<'_>,
         cursor: mouse::Cursor,
         renderer: &Renderer,

diff --git a/core/src/overlay.rs b/core/src/overlay.rs
@@ -58,7 +58,7 @@ where
     /// By default, it does nothing.
     fn update(
         &mut self,
-        _event: Event,
+        _event: &Event,
         _layout: Layout<'_>,
         _cursor: mouse::Cursor,
         _renderer: &Renderer,

diff --git a/core/src/overlay/element.rs b/core/src/overlay/element.rs
@@ -51,7 +51,7 @@ where
     /// Processes a runtime [`Event`].
     pub fn update(
         &mut self,
-        event: Event,
+        event: &Event,
         layout: Layout<'_>,
         cursor: mouse::Cursor,
         renderer: &Renderer,
@@ -150,7 +150,7 @@ where
 
     fn update(
         &mut self,
-        event: Event,
+        event: &Event,
         layout: Layout<'_>,
         cursor: mouse::Cursor,
         renderer: &Renderer,

diff --git a/core/src/overlay/group.rs b/core/src/overlay/group.rs
@@ -74,22 +74,15 @@ where
 
     fn update(
         &mut self,
-        event: Event,
+        event: &Event,
         layout: Layout<'_>,
         cursor: mouse::Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
     ) {
         for (child, layout) in self.children.iter_mut().zip(layout.children()) {
-            child.update(
-                event.clone(),
-                layout,
-                cursor,
-                renderer,
-                clipboard,
-                shell,
-            );
+            child.update(event, layout, cursor, renderer, clipboard, shell);
         }
     }
 

diff --git a/core/src/widget.rs b/core/src/widget.rs
@@ -114,7 +114,7 @@ where
     fn update(
         &mut self,
         _state: &mut Tree,
-        _event: Event,
+        _event: &Event,
         _layout: Layout<'_>,
         _cursor: mouse::Cursor,
         _renderer: &Renderer,

diff --git a/examples/bezier_tool/src/main.rs b/examples/bezier_tool/src/main.rs
@@ -93,7 +93,7 @@ mod bezier {
         fn update(
             &self,
             state: &mut Self::State,
-            event: Event,
+            event: &Event,
             bounds: Rectangle,
             cursor: mouse::Cursor,
         ) -> Option<canvas::Action<Curve>> {

diff --git a/examples/game_of_life/src/main.rs b/examples/game_of_life/src/main.rs
@@ -380,7 +380,7 @@ mod grid {
         fn update(
             &self,
             interaction: &mut Interaction,
-            event: Event,
+            event: &Event,
             bounds: Rectangle,
             cursor: mouse::Cursor,
         ) -> Option<canvas::Action<Message>> {
@@ -471,7 +471,7 @@ mod grid {
                             _ => action.and_capture(),
                         })
                     }
-                    mouse::Event::WheelScrolled { delta } => match delta {
+                    mouse::Event::WheelScrolled { delta } => match *delta {
                         mouse::ScrollDelta::Lines { y, .. }
                         | mouse::ScrollDelta::Pixels { y, .. } => {
                             if y < 0.0 && self.scaling > Self::MIN_SCALING

diff --git a/examples/loading_spinners/src/circular.rs b/examples/loading_spinners/src/circular.rs
@@ -264,7 +264,7 @@ where
     fn update(
         &mut self,
         tree: &mut Tree,
-        event: Event,
+        event: &Event,
         _layout: Layout<'_>,
         _cursor: mouse::Cursor,
         _renderer: &Renderer,
@@ -278,7 +278,7 @@ where
             state.animation = state.animation.timed_transition(
                 self.cycle_duration,
                 self.rotation_duration,
-                now,
+                *now,
             );
 
             state.cache.clear();

diff --git a/examples/loading_spinners/src/linear.rs b/examples/loading_spinners/src/linear.rs
@@ -178,7 +178,7 @@ where
     fn update(
         &mut self,
         tree: &mut Tree,
-        event: Event,
+        event: &Event,
         _layout: Layout<'_>,
         _cursor: mouse::Cursor,
         _renderer: &Renderer,
@@ -189,7 +189,7 @@ where
         let state = tree.state.downcast_mut::<State>();
 
         if let Event::Window(window::Event::RedrawRequested(now)) = event {
-            *state = state.timed_transition(self.cycle_duration, now);
+            *state = state.timed_transition(self.cycle_duration, *now);
 
             shell.request_redraw();
         }

diff --git a/examples/multitouch/src/main.rs b/examples/multitouch/src/main.rs
@@ -55,11 +55,11 @@ impl canvas::Program<Message> for Multitouch {
     fn update(
         &self,
         _state: &mut Self::State,
-        event: Event,
+        event: &Event,
         _bounds: Rectangle,
         _cursor: mouse::Cursor,
     ) -> Option<canvas::Action<Message>> {
-        let message = match event {
+        let message = match event.clone() {
             Event::Touch(
                 touch::Event::FingerPressed { id, position }
                 | touch::Event::FingerMoved { id, position },

diff --git a/examples/sierpinski_triangle/src/main.rs b/examples/sierpinski_triangle/src/main.rs
@@ -76,7 +76,7 @@ impl canvas::Program<Message> for SierpinskiGraph {
     fn update(
         &self,
         _state: &mut Self::State,
-        event: Event,
+        event: &Event,
         bounds: Rectangle,
         cursor: mouse::Cursor,
     ) -> Option<canvas::Action<Message>> {

diff --git a/examples/toast/src/main.rs b/examples/toast/src/main.rs
@@ -361,7 +361,7 @@ mod toast {
         fn update(
             &mut self,
             state: &mut Tree,
-            event: Event,
+            event: &Event,
             layout: Layout<'_>,
             cursor: mouse::Cursor,
             renderer: &Renderer,
@@ -491,7 +491,7 @@ mod toast {
 
         fn update(
             &mut self,
-            event: Event,
+            event: &Event,
             layout: Layout<'_>,
             cursor: mouse::Cursor,
             renderer: &Renderer,
@@ -530,7 +530,7 @@ mod toast {
 
                 child.as_widget_mut().update(
                     state,
-                    event.clone(),
+                    event,
                     layout,
                     cursor,
                     renderer,

diff --git a/runtime/src/overlay/nested.rs b/runtime/src/overlay/nested.rs
@@ -160,7 +160,7 @@ where
     /// Processes a runtime [`Event`].
     pub fn update(
         &mut self,
-        event: Event,
+        event: &Event,
         layout: Layout<'_>,
         cursor: mouse::Cursor,
         renderer: &Renderer,
@@ -170,7 +170,7 @@ where
         fn recurse<Message, Theme, Renderer>(
             element: &mut overlay::Element<'_, Message, Theme, Renderer>,
             layout: Layout<'_>,
-            event: Event,
+            event: &Event,
             cursor: mouse::Cursor,
             renderer: &Renderer,
             clipboard: &mut dyn Clipboard,
@@ -188,7 +188,7 @@ where
                     recurse(
                         &mut nested,
                         nested_layout,
-                        event.clone(),
+                        event,
                         cursor,
                         renderer,
                         clipboard,

diff --git a/runtime/src/user_interface.rs b/runtime/src/user_interface.rs
@@ -210,7 +210,7 @@ where
             let mut layout = overlay.layout(renderer, bounds);
             let mut event_statuses = Vec::new();
 
-            for event in events.iter().cloned() {
+            for event in events {
                 let mut shell = Shell::new(messages);
 
                 overlay.update(
@@ -294,7 +294,6 @@ where
 
         let event_statuses = events
             .iter()
-            .cloned()
             .zip(overlay_statuses)
             .map(|(event, overlay_status)| {
                 if matches!(overlay_status, event::Status::Captured) {

diff --git a/widget/src/button.rs b/widget/src/button.rs
@@ -275,7 +275,7 @@ where
     fn update(
         &mut self,
         tree: &mut Tree,
-        event: Event,
+        event: &Event,
         layout: Layout<'_>,
         cursor: mouse::Cursor,
         renderer: &Renderer,
@@ -285,7 +285,7 @@ where
     ) {
         self.content.as_widget_mut().update(
             &mut tree.children[0],
-            event.clone(),
+            event,
             layout.children().next().unwrap(),
             cursor,
             renderer,

diff --git a/widget/src/canvas.rs b/widget/src/canvas.rs
@@ -218,7 +218,7 @@ where
     fn update(
         &mut self,
         tree: &mut Tree,
-        event: Event,
+        event: &Event,
         layout: Layout<'_>,
         cursor: mouse::Cursor,
         renderer: &Renderer,

diff --git a/widget/src/canvas/program.rs b/widget/src/canvas/program.rs
@@ -32,7 +32,7 @@ where
     fn update(
         &self,
         _state: &mut Self::State,
-        _event: Event,
+        _event: &Event,
         _bounds: Rectangle,
         _cursor: mouse::Cursor,
     ) -> Option<Action<Message>> {
@@ -82,7 +82,7 @@ where
     fn update(
         &self,
         state: &mut Self::State,
-        event: Event,
+        event: &Event,
         bounds: Rectangle,
         cursor: mouse::Cursor,
     ) -> Option<Action<Message>> {

diff --git a/widget/src/checkbox.rs b/widget/src/checkbox.rs
@@ -305,7 +305,7 @@ where
     fn update(
         &mut self,
         _tree: &mut Tree,
-        event: Event,
+        event: &Event,
         layout: Layout<'_>,
         cursor: mouse::Cursor,
         _renderer: &Renderer,

diff --git a/widget/src/column.rs b/widget/src/column.rs
@@ -260,7 +260,7 @@ where
     fn update(
         &mut self,
         tree: &mut Tree,
-        event: Event,
+        event: &Event,
         layout: Layout<'_>,
         cursor: mouse::Cursor,
         renderer: &Renderer,
@@ -275,13 +275,7 @@ where
             .zip(layout.children())
         {
             child.as_widget_mut().update(
-                state,
-                event.clone(),
-                layout,
-                cursor,
-                renderer,
-                clipboard,
-                shell,
+                state, event, layout, cursor, renderer, clipboard, shell,
                 viewport,
             );
         }

diff --git a/widget/src/combo_box.rs b/widget/src/combo_box.rs
@@ -512,7 +512,7 @@ where
     fn update(
         &mut self,
         tree: &mut widget::Tree,
-        event: Event,
+        event: &Event,
         layout: Layout<'_>,
         cursor: mouse::Cursor,
         renderer: &Renderer,
@@ -540,7 +540,7 @@ where
         // Provide it to the widget
         self.text_input.update(
             &mut tree.children[0],
-            event.clone(),
+            event,
             layout,
             cursor,
             renderer,
@@ -737,7 +737,7 @@ where
                 let mut local_shell = Shell::new(&mut local_messages);
                 self.text_input.update(
                     &mut tree.children[0],
-                    Event::Mouse(mouse::Event::ButtonPressed(
+                    &Event::Mouse(mouse::Event::ButtonPressed(
                         mouse::Button::Left,
                     )),
                     layout,

diff --git a/widget/src/container.rs b/widget/src/container.rs
@@ -300,7 +300,7 @@ where
     fn update(
         &mut self,
         tree: &mut Tree,
-        event: Event,
+        event: &Event,
         layout: Layout<'_>,
         cursor: mouse::Cursor,
         renderer: &Renderer,

diff --git a/widget/src/helpers.rs b/widget/src/helpers.rs
@@ -633,7 +633,7 @@ where
         fn update(
             &mut self,
             state: &mut Tree,
-            event: Event,
+            event: &Event,
             layout: Layout<'_>,
             cursor: mouse::Cursor,
             renderer: &Renderer,
@@ -836,7 +836,7 @@ where
         fn update(
             &mut self,
             tree: &mut Tree,
-            event: Event,
+            event: &Event,
             layout: Layout<'_>,
             cursor: mouse::Cursor,
             renderer: &Renderer,
@@ -885,14 +885,8 @@ where
                 let redraw_request = shell.redraw_request();
 
                 self.top.as_widget_mut().update(
-                    top_tree,
-                    event.clone(),
-                    top_layout,
-                    cursor,
-                    renderer,
-                    clipboard,
-                    shell,
-                    viewport,
+                    top_tree, event, top_layout, cursor, renderer, clipboard,
+                    shell, viewport,
                 );
 
                 // Ignore redraw requests of invisible content
@@ -907,7 +901,7 @@ where
 
             self.base.as_widget_mut().update(
                 base_tree,
-                event.clone(),
+                event,
                 base_layout,
                 cursor,
                 renderer,