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

New iced changes

Browse source
This commit is contained in:
Bingus 2023-01-18 15:17:20 -08:00
parent 70d487ba20
commit 7e9a12a4aa
No known key found for this signature in database
GPG key ID: 5F84D2AA40A9F170
4 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
native/src/subscription.rs
View file

@ -70,7 +70,7 @@ where
events.filter_map(move |(event, status)| { events.filter_map(move |(event, status)| {
future::ready(match event { future::ready(match event {
Event::Window(window::Event::RedrawRequested(_)) => None, Event::Window(_, window::Event::RedrawRequested(_)) => None,
_ => f(event, status), _ => f(event, status),
}) })
}) })

2
native/src/widget/text_input.rs
View file

@ -782,7 +782,7 @@ where
state.keyboard_modifiers = modifiers; state.keyboard_modifiers = modifiers;
} }
Event::Window(window::Event::RedrawRequested(now)) => { Event::Window(_, window::Event::RedrawRequested(now)) => {
let state = state(); let state = state();
if let Some(focus) = &mut state.is_focused { if let Some(focus) = &mut state.is_focused {

6
native/src/window.rs
View file

@ -5,8 +5,8 @@ mod icon;
mod id; mod id;
mod mode; mod mode;
mod position; mod position;
mod settings;
mod redraw_request; mod redraw_request;
mod settings;
mod user_attention; mod user_attention;
pub use action::Action; pub use action::Action;
@ -15,8 +15,8 @@ pub use icon::Icon;
pub use id::Id; pub use id::Id;
pub use mode::Mode; pub use mode::Mode;
pub use position::Position; pub use position::Position;
pub use settings::Settings;
pub use redraw_request::RedrawRequest; pub use redraw_request::RedrawRequest;
pub use settings::Settings;
pub use user_attention::UserAttention; pub use user_attention::UserAttention;
use crate::subscription::{self, Subscription}; use crate::subscription::{self, Subscription};
@ -32,7 +32,7 @@ use crate::time::Instant;
/// animations without missing any frames. /// animations without missing any frames.
pub fn frames() -> Subscription<Instant> { pub fn frames() -> Subscription<Instant> {
subscription::raw_events(|event, _status| match event { subscription::raw_events(|event, _status| match event {
crate::Event::Window(Event::RedrawRequested(at)) => Some(at), crate::Event::Window(_, Event::RedrawRequested(at)) => Some(at),
_ => None, _ => None,
}) })
} }

1
winit/src/application.rs
View file

@ -402,6 +402,7 @@ async fn run_instance<A, E, C>(
// Then, we can use the `interface_state` here to decide if a redraw // Then, we can use the `interface_state` here to decide if a redraw
// is needed right away, or simply wait until a specific time. // is needed right away, or simply wait until a specific time.
let redraw_event = Event::Window( let redraw_event = Event::Window(
crate::window::Id::MAIN,
crate::window::Event::RedrawRequested(Instant::now()), crate::window::Event::RedrawRequested(Instant::now()),
); );