diff options
| -rw-r--r-- | core/Cargo.toml | 5 | ||||
| -rw-r--r-- | core/src/time.rs | 6 | ||||
| -rw-r--r-- | futures/Cargo.toml | 1 | ||||
| -rw-r--r-- | futures/src/backend/wasm/wasm_bindgen.rs | 44 | ||||
| -rw-r--r-- | native/src/mouse/click.rs | 9 | ||||
| -rw-r--r-- | src/lib.rs | 15 | ||||
| -rw-r--r-- | src/time.rs | 2 |
7 files changed, 61 insertions, 21 deletions
diff --git a/core/Cargo.toml b/core/Cargo.toml index 83458ac0..dde34326 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -14,6 +14,5 @@ bitflags = "1.2" version = "0.5" optional = true -[target.'cfg(target_arch = "wasm32")'.dependencies.instant] -version = "0.1" -features = ["wasm-bindgen"] +[target.'cfg(target_arch = "wasm32")'.dependencies] +wasm-timer = { version = "0.2" } diff --git a/core/src/time.rs b/core/src/time.rs index 5f95ee86..f496d1a4 100644 --- a/core/src/time.rs +++ b/core/src/time.rs @@ -1,7 +1,9 @@ //! Keep track of time, both in native and web platforms! #[cfg(target_arch = "wasm32")] -pub use instant::{Duration, Instant}; +pub use wasm_timer::Instant; #[cfg(not(target_arch = "wasm32"))] -pub use std::time::{Duration, Instant}; +pub use std::time::Instant; + +pub use std::time::Duration; diff --git a/futures/Cargo.toml b/futures/Cargo.toml index aa55df1e..93c7693d 100644 --- a/futures/Cargo.toml +++ b/futures/Cargo.toml @@ -36,6 +36,7 @@ optional = true [target.'cfg(target_arch = "wasm32")'.dependencies] wasm-bindgen-futures = "0.4" +wasm-timer = "0.2" [package.metadata.docs.rs] rustdoc-args = ["--cfg", "docsrs"] diff --git a/futures/src/backend/wasm/wasm_bindgen.rs b/futures/src/backend/wasm/wasm_bindgen.rs index e914aeba..b726501a 100644 --- a/futures/src/backend/wasm/wasm_bindgen.rs +++ b/futures/src/backend/wasm/wasm_bindgen.rs @@ -13,3 +13,47 @@ impl crate::Executor for Executor { wasm_bindgen_futures::spawn_local(future); } } + +pub mod time { + //! Listen and react to time. + use crate::subscription::{self, Subscription}; + use crate::BoxStream; + + /// Returns a [`Subscription`] that produces messages at a set interval. + /// + /// The first message is produced after a `duration`, and then continues to + /// produce more messages every `duration` after that. + pub fn every<H: std::hash::Hasher, E>( + duration: std::time::Duration, + ) -> Subscription<H, E, wasm_timer::Instant> { + Subscription::from_recipe(Every(duration)) + } + + #[derive(Debug)] + struct Every(std::time::Duration); + + impl<H, E> subscription::Recipe<H, E> for Every + where + H: std::hash::Hasher, + { + type Output = wasm_timer::Instant; + + fn hash(&self, state: &mut H) { + use std::hash::Hash; + + std::any::TypeId::of::<Self>().hash(state); + self.0.hash(state); + } + + fn stream( + self: Box<Self>, + _input: BoxStream<E>, + ) -> BoxStream<Self::Output> { + use futures::stream::StreamExt; + + wasm_timer::Interval::new(self.0) + .map(|_| wasm_timer::Instant::now()) + .boxed_local() + } + } +} diff --git a/native/src/mouse/click.rs b/native/src/mouse/click.rs index ec321387..4a7d796c 100644 --- a/native/src/mouse/click.rs +++ b/native/src/mouse/click.rs @@ -62,9 +62,14 @@ impl Click { } fn is_consecutive(&self, new_position: Point, time: Instant) -> bool { + let duration = if time > self.time { + Some(time - self.time) + } else { + None + }; + self.position == new_position - && time - .checked_duration_since(self.time) + && duration .map(|duration| duration.as_millis() <= 300) .unwrap_or(false) } @@ -191,23 +191,10 @@ pub mod executor; pub mod keyboard; pub mod mouse; pub mod settings; +pub mod time; pub mod widget; pub mod window; -#[cfg(all( - any(feature = "tokio", feature = "async-std", feature = "smol"), - not(target_arch = "wasm32") -))] -#[cfg_attr( - docsrs, - doc(cfg(any( - feature = "tokio", - feature = "async-std" - feature = "smol" - ))) -)] -pub mod time; - #[cfg(all(not(feature = "glow"), feature = "wgpu"))] use iced_winit as runtime; diff --git a/src/time.rs b/src/time.rs index 4f831171..37d454ed 100644 --- a/src/time.rs +++ b/src/time.rs @@ -1,2 +1,4 @@ //! Listen and react to time. +pub use iced_core::time::{Duration, Instant}; + pub use iced_futures::backend::default::time::*; |