From 69c50c851193348ed3aab746678741f3cdda9fb3 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 12 Nov 2020 02:22:22 +0100 Subject: Introduce `event::Status` to `Subscription` --- native/src/subscription/events.rs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'native/src/subscription') diff --git a/native/src/subscription/events.rs b/native/src/subscription/events.rs index a1ae6051..f689f3af 100644 --- a/native/src/subscription/events.rs +++ b/native/src/subscription/events.rs @@ -1,16 +1,15 @@ -use crate::{ - subscription::{EventStream, Recipe}, - Event, Hasher, -}; +use crate::event::{self, Event}; +use crate::subscription::{EventStream, Recipe}; +use crate::Hasher; use iced_futures::futures::future; use iced_futures::futures::StreamExt; use iced_futures::BoxStream; pub struct Events { - pub(super) f: fn(Event) -> Option, + pub(super) f: fn(Event, event::Status) -> Option, } -impl Recipe for Events +impl Recipe for Events where Message: 'static + Send, { @@ -29,7 +28,9 @@ where event_stream: EventStream, ) -> BoxStream { event_stream - .filter_map(move |event| future::ready((self.f)(event))) + .filter_map(move |(event, status)| { + future::ready((self.f)(event, status)) + }) .boxed() } } -- cgit