diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-11-12 01:29:11 +0100 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-11-12 01:29:11 +0100 |
| commit | 6e9bd0d9d1dc9a98645d427d62b8413273dc6efd (patch) | |
| tree | a7a635629295335161babffa6f1e26e3e9c26f69 /native/src/overlay | |
| parent | 3aca1771329cf7845cbc6c98e536cfb6c0e7c3ff (diff) | |
| download | iced-6e9bd0d9d1dc9a98645d427d62b8413273dc6efd.tar.gz iced-6e9bd0d9d1dc9a98645d427d62b8413273dc6efd.tar.bz2 iced-6e9bd0d9d1dc9a98645d427d62b8413273dc6efd.zip | |
Make `Overlay::on_event` return `event::Status`
Diffstat (limited to 'native/src/overlay')
| -rw-r--r-- | native/src/overlay/element.rs | 12 | ||||
| -rw-r--r-- | native/src/overlay/menu.rs | 6 |
2 files changed, 11 insertions, 7 deletions
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( |