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

Introduce Renderer argument to mouse_interaction and on_event

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2022-01-11 14:12:28 +07:00
parent 6ab4611a6e
commit 810e086728
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
24 changed files with 165 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -80,9 +80,14 @@ where
layout: Layout<'_>,
cursor_position: Point,
viewport: &Rectangle,
renderer: &Renderer,
) -> mouse::Interaction {
self.overlay
.mouse_interaction(layout, cursor_position, viewport)
self.overlay.mouse_interaction(
layout,
cursor_position,
viewport,
renderer,
)
}
/// Draws the [`Element`] and its children using the given [`Layout`].
@ -160,9 +165,14 @@ where
layout: Layout<'_>,
cursor_position: Point,
viewport: &Rectangle,
renderer: &Renderer,
) -> mouse::Interaction {
self.content
.mouse_interaction(layout, cursor_position, viewport)
self.content.mouse_interaction(
layout,
cursor_position,
viewport,
renderer,
)
}
fn draw(

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

@ -239,9 +239,14 @@ where
layout: Layout<'_>,
cursor_position: Point,
viewport: &Rectangle,
renderer: &Renderer,
) -> mouse::Interaction {
self.container
.mouse_interaction(layout, cursor_position, viewport)
self.container.mouse_interaction(
layout,
cursor_position,
viewport,
renderer,
)
}
fn draw(
@ -392,6 +397,7 @@ where
layout: Layout<'_>,
cursor_position: Point,
_viewport: &Rectangle,
_renderer: &Renderer,
) -> mouse::Interaction {
let is_mouse_over = layout.bounds().contains(cursor_position);