me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move viewport argument to last position in mouse_interaction methods

Browse source 
This keeps the order of the arguments consistent with `draw`.
This commit is contained in:
Héctor Ramón Jiménez 2021-11-02 15:03:29 +07:00
parent c330bb1b69
commit 631e95ee0b
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
24 changed files with 61 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

14
native/src/overlay/element.rs
View file

@ -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,

6
native/src/overlay/menu.rs
View file

@ -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);