forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Process WindowCloseRequested events after app update

Browse Source 
Pressing the window close button when in a reactive UpdateMode
isn't handled until the reactive wait timeout is triggered or
the user triggers some other device event. This change adds an
explict check for the WindowCloseRequested event to trigger
another app update to process it.
This commit is contained in:
Aaron Loucks 2025-03-29 11:44:26 -04:00
parent da40715bf1
commit 61ba0fbfb6
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crates/bevy_winit/src/state.rs
View File

@ -537,6 +537,7 @@ impl<T: Event> ApplicationHandler<T> for WinitAppRunnerState<T> {
impl<T: Event> WinitAppRunnerState<T> {
fn redraw_requested(&mut self, event_loop: &ActiveEventLoop) {
let mut redraw_event_reader = EventCursor::<RequestRedraw>::default();
let mut close_event_reader = EventCursor::<WindowCloseRequested>::default();
let mut focused_windows_state: SystemState<(Res<WinitSettings>, Query<(Entity, &Window)>)> =
SystemState::new(self.world_mut());
@ -662,6 +663,19 @@ impl<T: Event> WinitAppRunnerState<T> {
let (config, windows) = focused_windows_state.get(self.world());
let focused = windows.iter().any(|(_, window)| window.focused);
update_mode = config.update_mode(focused);
// Running the app may have produced WindowCloseRequested events that should be processed
if let Some(close_request_events) =
self.world().get_resource::<Events<WindowCloseRequested>>()
{
if close_event_reader
.read(close_request_events)
.last()
.is_some()
{
self.redraw_requested = true;
}
}
}
// The update mode could have been changed, so we need to redraw and force an update