From 810e086728e938d1d12758c7b486c1e371127349 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Tue, 11 Jan 2022 14:12:28 +0700 Subject: Introduce `Renderer` argument to `mouse_interaction` and `on_event` --- native/src/overlay/element.rs | 18 ++++++++++++++---- native/src/overlay/menu.rs | 10 ++++++++-- 2 files changed, 22 insertions(+), 6 deletions(-) (limited to 'native/src/overlay') diff --git a/native/src/overlay/element.rs b/native/src/overlay/element.rs index 70cb417e..e7621600 100644 --- a/native/src/overlay/element.rs +++ b/native/src/overlay/element.rs @@ -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( diff --git a/native/src/overlay/menu.rs b/native/src/overlay/menu.rs index c0282aae..2deef551 100644 --- a/native/src/overlay/menu.rs +++ b/native/src/overlay/menu.rs @@ -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); -- cgit