migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-08-30 21:30:03 -04:00
Code Activity

Properly end winit event loop (#7565)

Browse Source
This commit is contained in:
Tye
2025-09-30 14:48:54 +01:00
committed by GitHub
parent 47c5617740
commit a450b1c989
4 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
crates/eframe/src/native/wgpu_integration.rs
View File

@@ -461,7 +461,8 @@ impl WinitApp for WgpuWinitApp<'_> {
if let Some(running) = &mut self.running {
Ok(running.on_window_event(window_id, &event))
} else {
Ok(EventResult::Wait)
// running is removed to get ready for exiting
Ok(EventResult::Exit)
}
}
@@ -739,7 +740,7 @@ impl WgpuWinitRunning<'_> {
}
if integration.should_close() {
Ok(EventResult::Exit)
Ok(EventResult::CloseRequested)
} else {
Ok(EventResult::Wait)
}
@@ -799,7 +800,7 @@ impl WgpuWinitRunning<'_> {
log::debug!(
"Received WindowEvent::CloseRequested for main viewport - shutting down."
);
return EventResult::Exit;
return EventResult::CloseRequested;
}
log::debug!("Received WindowEvent::CloseRequested for viewport {viewport_id:?}");
@@ -833,7 +834,7 @@ impl WgpuWinitRunning<'_> {
.unwrap_or_default();
if integration.should_close() {
EventResult::Exit
EventResult::CloseRequested
} else if event_response.repaint {
if repaint_asap {
EventResult::RepaintNow(window_id)