Roll back winit to current alpha

This commit is contained in:
Héctor Ramón Jiménez 2019-11-24 17:44:29 +01:00
parent 84874ac5dc
commit 8c82e09473
2 changed files with 5 additions and 8 deletions

View File

@ -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"

View File

@ -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,
..