From 66823e9a65328e1da9b75f99958d05846d8ead43 Mon Sep 17 00:00:00 2001 From: dtzxporter Date: Thu, 25 Jan 2024 15:23:30 -0500 Subject: Emulate `AboutToWait` event on Windows while resizing More details: https://github.com/rust-windowing/winit/issues/3272 --- winit/src/application.rs | 51 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/winit/src/application.rs b/winit/src/application.rs index 6a176834..52cf7fe8 100644 --- a/winit/src/application.rs +++ b/winit/src/application.rs @@ -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(()) -- cgit