From 631e95ee0be01dc7f5e5183e1429972aee37787f Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 2 Nov 2021 15:03:29 +0700
Subject: Move `viewport` argument to last position in `mouse_interaction`
 methods

This keeps the order of the arguments consistent with `draw`.
---
 native/src/overlay/element.rs | 14 ++++++++++++--
 native/src/overlay/menu.rs    |  6 +++---
 2 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'native/src/overlay')

diff --git a/native/src/overlay/element.rs b/native/src/overlay/element.rs
index 988cca09..ef676fb4 100644
--- a/native/src/overlay/element.rs
+++ b/native/src/overlay/element.rs
@@ -72,11 +72,11 @@ where
     pub fn mouse_interaction(
         &self,
         layout: Layout<'_>,
-        viewport: &Rectangle,
         cursor_position: Point,
+        viewport: &Rectangle,
     ) -> mouse::Interaction {
         self.overlay
-            .mouse_interaction(layout, viewport, cursor_position)
+            .mouse_interaction(layout, cursor_position, viewport)
     }
 
     /// Draws the [`Element`] and its children using the given [`Layout`].
@@ -150,6 +150,16 @@ where
         event_status
     }
 
+    fn mouse_interaction(
+        &self,
+        layout: Layout<'_>,
+        cursor_position: Point,
+        viewport: &Rectangle,
+    ) -> mouse::Interaction {
+        self.content
+            .mouse_interaction(layout, cursor_position, viewport)
+    }
+
     fn draw(
         &self,
         renderer: &mut Renderer,
diff --git a/native/src/overlay/menu.rs b/native/src/overlay/menu.rs
index c4d1e171..12dd4b0b 100644
--- a/native/src/overlay/menu.rs
+++ b/native/src/overlay/menu.rs
@@ -237,11 +237,11 @@ where
     fn mouse_interaction(
         &self,
         layout: Layout<'_>,
-        viewport: &Rectangle,
         cursor_position: Point,
+        viewport: &Rectangle,
     ) -> mouse::Interaction {
         self.container
-            .mouse_interaction(layout, viewport, cursor_position)
+            .mouse_interaction(layout, cursor_position, viewport)
     }
 
     fn draw(
@@ -388,8 +388,8 @@ where
     fn mouse_interaction(
         &self,
         layout: Layout<'_>,
-        _viewport: &Rectangle,
         cursor_position: Point,
+        _viewport: &Rectangle,
     ) -> mouse::Interaction {
         let is_mouse_over = layout.bounds().contains(cursor_position);
 
-- 
cgit