From 8c82e094736750c5a13ae8f349e61182ed621b1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= Date: Sun, 24 Nov 2019 17:44:29 +0100 Subject: [PATCH] Roll back `winit` to current alpha --- winit/Cargo.toml | 2 +- winit/src/application.rs | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/winit/Cargo.toml b/winit/Cargo.toml index 2a33255d..dd0ec32a 100644 --- a/winit/Cargo.toml +++ b/winit/Cargo.toml @@ -12,6 +12,6 @@ debug = [] [dependencies] iced_native = { version = "0.1.0-alpha", path = "../native" } -winit = { version = "0.20.0-alpha3", git = "https://github.com/rust-windowing/winit", rev = "709808eb4e69044705fcb214bcc30556db761405"} +winit = "0.20.0-alpha4" futures = { version = "0.3", features = ["thread-pool"] } log = "0.4" diff --git a/winit/src/application.rs b/winit/src/application.rs index 1042b412..238eba4f 100644 --- a/winit/src/application.rs +++ b/winit/src/application.rs @@ -142,7 +142,7 @@ pub trait Application: Sized { window.request_redraw(); event_loop.run(move |event, _, control_flow| match event { - event::Event::MainEventsCleared => { + event::Event::EventsCleared => { // TODO: We should be able to keep a user interface alive // between events once we remove state references. // @@ -209,12 +209,6 @@ pub trait Application: Sized { cache = Some(user_interface.into_cache()); } - window.request_redraw(); - } - event::Event::UserEvent(message) => { - external_messages.push(message); - } - event::Event::RedrawRequested(_) => { debug.render_started(); if let Some(new_size) = new_size.take() { @@ -247,6 +241,9 @@ pub trait Application: Sized { // TODO: Handle animations! // Maybe we can use `ControlFlow::WaitUntil` for this. } + event::Event::UserEvent(message) => { + external_messages.push(message); + } event::Event::WindowEvent { event: window_event, ..