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

Make Overlay::on_event return event::Status

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2020-11-12 01:29:11 +01:00
parent 3aca177132
commit 6e9bd0d9d1
4 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

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