Merge pull request #1956 from tarkah/feat/on-event-viewport

Add viewport to `Widget::on_event`

4 files changed, 10 insertions, 0 deletions

diff --git a/examples/loading_spinners/src/circular.rs b/examples/loading_spinners/src/circular.rs
index 3a35e029..3898d76e 100644
--- a/examples/loading_spinners/src/circular.rs
+++ b/examples/loading_spinners/src/circular.rs
@@ -272,6 +272,7 @@ where
         _renderer: &iced::Renderer<Theme>,
         _clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
+        _viewport: &Rectangle,
     ) -> event::Status {
         const FRAME_RATE: u64 = 60;
 
diff --git a/examples/loading_spinners/src/linear.rs b/examples/loading_spinners/src/linear.rs
index 3d95729b..20fbe9f3 100644
--- a/examples/loading_spinners/src/linear.rs
+++ b/examples/loading_spinners/src/linear.rs
@@ -193,6 +193,7 @@ where
         _renderer: &Renderer,
         _clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
+        _viewport: &Rectangle,
     ) -> event::Status {
         const FRAME_RATE: u64 = 60;
 
diff --git a/examples/modal/src/main.rs b/examples/modal/src/main.rs
index 7fcbbfe4..8a48f830 100644
--- a/examples/modal/src/main.rs
+++ b/examples/modal/src/main.rs
@@ -300,6 +300,7 @@ mod modal {
             renderer: &Renderer,
             clipboard: &mut dyn Clipboard,
             shell: &mut Shell<'_, Message>,
+            viewport: &Rectangle,
         ) -> event::Status {
             self.base.as_widget_mut().on_event(
                 &mut state.children[0],
@@ -309,6 +310,7 @@ mod modal {
                 renderer,
                 clipboard,
                 shell,
+                viewport,
             )
         }
 
@@ -446,6 +448,7 @@ mod modal {
                 renderer,
                 clipboard,
                 shell,
+                &layout.bounds(),
             )
         }
 
diff --git a/examples/toast/src/main.rs b/examples/toast/src/main.rs
index 4282ddcf..5d29e895 100644
--- a/examples/toast/src/main.rs
+++ b/examples/toast/src/main.rs
@@ -400,6 +400,7 @@ mod toast {
             renderer: &Renderer,
             clipboard: &mut dyn Clipboard,
             shell: &mut Shell<'_, Message>,
+            viewport: &Rectangle,
         ) -> event::Status {
             self.content.as_widget_mut().on_event(
                 &mut state.children[0],
@@ -409,6 +410,7 @@ mod toast {
                 renderer,
                 clipboard,
                 shell,
+                viewport,
             )
         }
 
@@ -559,6 +561,8 @@ mod toast {
                 }
             }
 
+            let viewport = layout.bounds();
+
             self.toasts
                 .iter_mut()
                 .zip(self.state.iter_mut())
@@ -576,6 +580,7 @@ mod toast {
                         renderer,
                         clipboard,
                         &mut local_shell,
+                        &viewport,
                     );
 
                     if !local_shell.is_empty() {