diff options
Diffstat (limited to '')
| -rw-r--r-- | native/src/subscription.rs | 2 | ||||
| -rw-r--r-- | native/src/widget/text_input.rs | 2 | ||||
| -rw-r--r-- | native/src/window.rs | 6 | ||||
| -rw-r--r-- | winit/src/application.rs | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/native/src/subscription.rs b/native/src/subscription.rs index 8c92efad..f517fc70 100644 --- a/native/src/subscription.rs +++ b/native/src/subscription.rs @@ -70,7 +70,7 @@ where events.filter_map(move |(event, status)| { future::ready(match event { - Event::Window(window::Event::RedrawRequested(_)) => None, + Event::Window(_, window::Event::RedrawRequested(_)) => None, _ => f(event, status), }) }) diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs index 8755b85d..a62d9f35 100644 --- a/native/src/widget/text_input.rs +++ b/native/src/widget/text_input.rs @@ -782,7 +782,7 @@ where state.keyboard_modifiers = modifiers; } - Event::Window(window::Event::RedrawRequested(now)) => { + Event::Window(_, window::Event::RedrawRequested(now)) => { let state = state(); if let Some(focus) = &mut state.is_focused { diff --git a/native/src/window.rs b/native/src/window.rs index d3c8c96f..660cd54f 100644 --- a/native/src/window.rs +++ b/native/src/window.rs @@ -5,8 +5,8 @@ mod icon; mod id; mod mode; mod position; -mod settings; mod redraw_request; +mod settings; mod user_attention; pub use action::Action; @@ -15,8 +15,8 @@ pub use icon::Icon; pub use id::Id; pub use mode::Mode; pub use position::Position; -pub use settings::Settings; pub use redraw_request::RedrawRequest; +pub use settings::Settings; pub use user_attention::UserAttention; use crate::subscription::{self, Subscription}; @@ -32,7 +32,7 @@ use crate::time::Instant; /// animations without missing any frames. pub fn frames() -> Subscription<Instant> { subscription::raw_events(|event, _status| match event { - crate::Event::Window(Event::RedrawRequested(at)) => Some(at), + crate::Event::Window(_, Event::RedrawRequested(at)) => Some(at), _ => None, }) } diff --git a/winit/src/application.rs b/winit/src/application.rs index c66e08b2..d586fd21 100644 --- a/winit/src/application.rs +++ b/winit/src/application.rs @@ -402,6 +402,7 @@ async fn run_instance<A, E, C>( // Then, we can use the `interface_state` here to decide if a redraw // is needed right away, or simply wait until a specific time. let redraw_event = Event::Window( + crate::window::Id::MAIN, crate::window::Event::RedrawRequested(Instant::now()), ); |