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

Always use event_loop.run

Browse source
This commit is contained in:
Kai Mast 2022-01-27 14:52:53 -06:00 • committed by Héctor Ramón Jiménez
parent f3fb00f838
commit f39147d382
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
1 changed files with 30 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

107
winit/src/application.rs
View file

@ -115,15 +115,10 @@ where
use futures::task; use futures::task;
use futures::Future; use futures::Future;
use winit::event_loop::EventLoop; use winit::event_loop::EventLoop;
#[cfg(not(target_arch = "wasm32"))]
use winit::platform::run_return::EventLoopExtRunReturn;
let mut debug = Debug::new(); let mut debug = Debug::new();
debug.startup_started(); debug.startup_started();
#[cfg(not(target_arch = "wasm32"))]
let mut event_loop = EventLoop::with_user_event();
#[cfg(target_arch = "wasm32")]
let event_loop = EventLoop::with_user_event(); let event_loop = EventLoop::with_user_event();
let mut proxy = event_loop.create_proxy(); let mut proxy = event_loop.create_proxy();
@ -183,81 +178,39 @@ where
let mut context = task::Context::from_waker(task::noop_waker_ref()); let mut context = task::Context::from_waker(task::noop_waker_ref());
#[cfg(not(target_arch = "wasm32"))] event_loop.run(move |event, _, control_flow| {
{ use winit::event_loop::ControlFlow;
event_loop.run_return(move |event, _, control_flow| {
use winit::event_loop::ControlFlow;
if let ControlFlow::Exit = control_flow { if let ControlFlow::Exit = control_flow {
return; return;
} }
let event = match event { let event = match event {
winit::event::Event::WindowEvent { winit::event::Event::WindowEvent {
event: event:
winit::event::WindowEvent::ScaleFactorChanged { winit::event::WindowEvent::ScaleFactorChanged {
new_inner_size, new_inner_size,
.. ..
}, },
window_id, window_id,
} => Some(winit::event::Event::WindowEvent { } => Some(winit::event::Event::WindowEvent {
event: winit::event::WindowEvent::Resized(*new_inner_size), event: winit::event::WindowEvent::Resized(*new_inner_size),
window_id, window_id,
}), }),
_ => event.to_static(), _ => event.to_static(),
};
if let Some(event) = event {
sender.start_send(event).expect("Send event");
let poll = instance.as_mut().poll(&mut context);
*control_flow = match poll {
task::Poll::Pending => ControlFlow::Wait,
task::Poll::Ready(_) => ControlFlow::Exit,
}; };
}
if let Some(event) = event { });
sender.start_send(event).expect("Send event");
let poll = instance.as_mut().poll(&mut context);
*control_flow = match poll {
task::Poll::Pending => ControlFlow::Wait,
task::Poll::Ready(_) => ControlFlow::Exit,
};
}
});
Ok(())
}
#[cfg(target_arch = "wasm32")]
{
event_loop.run(move |event, _, control_flow| {
use winit::event_loop::ControlFlow;
if let ControlFlow::Exit = control_flow {
return;
}
let event = match event {
winit::event::Event::WindowEvent {
event:
winit::event::WindowEvent::ScaleFactorChanged {
new_inner_size,
..
},
window_id,
} => Some(winit::event::Event::WindowEvent {
event: winit::event::WindowEvent::Resized(*new_inner_size),
window_id,
}),
_ => event.to_static(),
};
if let Some(event) = event {
sender.start_send(event).expect("Send event");
let poll = instance.as_mut().poll(&mut context);
*control_flow = match poll {
task::Poll::Pending => ControlFlow::Wait,
task::Poll::Ready(_) => ControlFlow::Exit,
};
}
});
}
} }
async fn run_instance<A, E, C>( async fn run_instance<A, E, C>(