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/widget/pane_grid/content.rs   | 6 +++---
 native/src/widget/pane_grid/title_bar.rs | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'native/src/widget/pane_grid')

diff --git a/native/src/widget/pane_grid/content.rs b/native/src/widget/pane_grid/content.rs
index efb3493b..c44506dd 100644
--- a/native/src/widget/pane_grid/content.rs
+++ b/native/src/widget/pane_grid/content.rs
@@ -201,8 +201,8 @@ where
     pub(crate) fn mouse_interaction(
         &self,
         layout: Layout<'_>,
-        viewport: &Rectangle,
         cursor_position: Point,
+        viewport: &Rectangle,
     ) -> mouse::Interaction {
         let (body_layout, title_bar_interaction) =
             if let Some(title_bar) = &self.title_bar {
@@ -218,8 +218,8 @@ where
 
                 let mouse_interaction = title_bar.mouse_interaction(
                     title_bar_layout,
-                    viewport,
                     cursor_position,
+                    viewport,
                 );
 
                 (children.next().unwrap(), mouse_interaction)
@@ -228,7 +228,7 @@ where
             };
 
         self.body
-            .mouse_interaction(body_layout, viewport, cursor_position)
+            .mouse_interaction(body_layout, cursor_position, viewport)
             .max(title_bar_interaction)
     }
 
diff --git a/native/src/widget/pane_grid/title_bar.rs b/native/src/widget/pane_grid/title_bar.rs
index ffd59488..070cf404 100644
--- a/native/src/widget/pane_grid/title_bar.rs
+++ b/native/src/widget/pane_grid/title_bar.rs
@@ -256,8 +256,8 @@ where
     pub(crate) fn mouse_interaction(
         &self,
         layout: Layout<'_>,
-        viewport: &Rectangle,
         cursor_position: Point,
+        viewport: &Rectangle,
     ) -> mouse::Interaction {
         let mut children = layout.children();
         let padded = children.next().unwrap();
@@ -267,15 +267,15 @@ where
 
         let title_interaction = self.content.mouse_interaction(
             title_layout,
-            viewport,
             cursor_position,
+            viewport,
         );
 
         if let Some(controls) = &self.controls {
             let controls_layout = children.next().unwrap();
 
             controls
-                .mouse_interaction(controls_layout, viewport, cursor_position)
+                .mouse_interaction(controls_layout, cursor_position, viewport)
                 .max(title_interaction)
         } else {
             title_interaction
-- 
cgit