Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Workaround issue with winit on windows not resuming the event loop. #2214

Merged
merged 3 commits into from
Feb 7, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 38 additions & 13 deletions winit/src/application.rs
Original file line number Diff line number Diff line change
Expand Up @@ -213,25 +213,50 @@ where

let mut context = task::Context::from_waker(task::noop_waker_ref());

let _ = event_loop.run(move |event, event_loop| {
if event_loop.exiting() {
return;
}
#[allow(unused_mut)]
let mut process_event =
move |event, event_loop: &winit::event_loop::EventLoopWindowTarget<_>| {
if event_loop.exiting() {
return;
}

event_sender.start_send(event).expect("Send event");
event_sender.start_send(event).expect("Send event");

let poll = instance.as_mut().poll(&mut context);
let poll = instance.as_mut().poll(&mut context);

match poll {
task::Poll::Pending => {
if let Ok(Some(flow)) = control_receiver.try_next() {
event_loop.set_control_flow(flow);
match poll {
task::Poll::Pending => {
if let Ok(Some(flow)) = control_receiver.try_next() {
event_loop.set_control_flow(flow);
}
}
task::Poll::Ready(_) => {
event_loop.exit();
}
}
task::Poll::Ready(_) => {
event_loop.exit();
}
};

#[cfg(not(target_os = "windows"))]
let _ = event_loop.run(process_event);

// TODO: Remove when unnecessary
// On Windows, we emulate an `AboutToWait` event after every `Resized` event
// since the event loop does not resume during resize interaction.
// More details: https://github.com/rust-windowing/winit/issues/3272
#[cfg(target_os = "windows")]
let _ = event_loop.run(move |event, event_loop| {
if matches!(
event,
winit::event::Event::WindowEvent {
event: winit::event::WindowEvent::Resized(_),
..
}
) {
process_event(event, event_loop);
process_event(winit::event::Event::AboutToWait, event_loop);
} else {
process_event(event, event_loop);
}
});

Ok(())
Expand Down
Loading