summaryrefslogtreecommitdiffstats
path: root/native/src/overlay
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2021-11-02 15:03:29 +0700
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2021-11-02 15:03:29 +0700
commit631e95ee0be01dc7f5e5183e1429972aee37787f (patch)
treeb7534cb783d02fefa2b2c040e5564efcfc24f487 /native/src/overlay
parentc330bb1b69d55d767fa5bb2e0fcc059fbbe07d07 (diff)
downloadiced-631e95ee0be01dc7f5e5183e1429972aee37787f.tar.gz
iced-631e95ee0be01dc7f5e5183e1429972aee37787f.tar.bz2
iced-631e95ee0be01dc7f5e5183e1429972aee37787f.zip
Move `viewport` argument to last position in `mouse_interaction` methods
This keeps the order of the arguments consistent with `draw`.
Diffstat (limited to 'native/src/overlay')
-rw-r--r--native/src/overlay/element.rs14
-rw-r--r--native/src/overlay/menu.rs6
2 files changed, 15 insertions, 5 deletions
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);