From 3f968b8c876b7c2351232856887fb9c3e3db3130 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 12 Nov 2020 00:09:52 +0100
Subject: Make `Widget::on_event` return an `event::Status`

---
 native/src/overlay/menu.rs | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'native/src/overlay')

diff --git a/native/src/overlay/menu.rs b/native/src/overlay/menu.rs
index 4b392a8e..3577629b 100644
--- a/native/src/overlay/menu.rs
+++ b/native/src/overlay/menu.rs
@@ -1,8 +1,14 @@
 //! Build and show dropdown menus.
+use crate::container;
+use crate::event::{self, Event};
+use crate::layout;
+use crate::mouse;
+use crate::overlay;
+use crate::scrollable;
+use crate::text;
 use crate::{
-    container, layout, mouse, overlay, scrollable, text, Clipboard, Container,
-    Element, Event, Hasher, Layout, Length, Point, Rectangle, Scrollable, Size,
-    Vector, Widget,
+    Clipboard, Container, Element, Hasher, Layout, Length, Point, Rectangle,
+    Scrollable, Size, Vector, Widget,
 };
 
 /// A list of selectable options.
@@ -236,7 +242,7 @@ where
         renderer: &Renderer,
         clipboard: Option<&dyn Clipboard>,
     ) {
-        self.container.on_event(
+        let _ = self.container.on_event(
             event.clone(),
             layout,
             cursor_position,
@@ -336,7 +342,7 @@ where
         _messages: &mut Vec<Message>,
         renderer: &Renderer,
         _clipboard: Option<&dyn Clipboard>,
-    ) {
+    ) -> event::Status {
         match event {
             Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) => {
                 let bounds = layout.bounds();
@@ -364,6 +370,8 @@ where
             }
             _ => {}
         }
+
+        event::Status::Ignored
     }
 
     fn draw(
-- 
cgit 


From 6e9bd0d9d1dc9a98645d427d62b8413273dc6efd Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 12 Nov 2020 01:29:11 +0100
Subject: Make `Overlay::on_event` return `event::Status`

---
 native/src/overlay/element.rs | 12 ++++++++----
 native/src/overlay/menu.rs    |  6 +++---
 2 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'native/src/overlay')

diff --git a/native/src/overlay/element.rs b/native/src/overlay/element.rs
index e1fd9b88..3f346695 100644
--- a/native/src/overlay/element.rs
+++ b/native/src/overlay/element.rs
@@ -1,6 +1,8 @@
 pub use crate::Overlay;
 
-use crate::{layout, Clipboard, Event, Hasher, Layout, Point, Size, Vector};
+use crate::event::{self, Event};
+use crate::layout;
+use crate::{Clipboard, Hasher, Layout, Point, Size, Vector};
 
 /// A generic [`Overlay`].
 ///
@@ -67,7 +69,7 @@ where
         messages: &mut Vec<Message>,
         renderer: &Renderer,
         clipboard: Option<&dyn Clipboard>,
-    ) {
+    ) -> event::Status {
         self.overlay.on_event(
             event,
             layout,
@@ -136,10 +138,10 @@ where
         messages: &mut Vec<B>,
         renderer: &Renderer,
         clipboard: Option<&dyn Clipboard>,
-    ) {
+    ) -> event::Status {
         let mut original_messages = Vec::new();
 
-        self.content.on_event(
+        let event_status = self.content.on_event(
             event,
             layout,
             cursor_position,
@@ -151,6 +153,8 @@ where
         original_messages
             .drain(..)
             .for_each(|message| messages.push((self.mapper)(message)));
+
+        event_status
     }
 
     fn draw(
diff --git a/native/src/overlay/menu.rs b/native/src/overlay/menu.rs
index 3577629b..d99b5940 100644
--- a/native/src/overlay/menu.rs
+++ b/native/src/overlay/menu.rs
@@ -241,15 +241,15 @@ where
         messages: &mut Vec<Message>,
         renderer: &Renderer,
         clipboard: Option<&dyn Clipboard>,
-    ) {
-        let _ = self.container.on_event(
+    ) -> event::Status {
+        self.container.on_event(
             event.clone(),
             layout,
             cursor_position,
             messages,
             renderer,
             clipboard,
-        );
+        )
     }
 
     fn draw(
-- 
cgit