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

Now a WindowEvent::CloseRequested is received will be sent to egui_winit::State in RawInput

Browse Source 
Now when we press the close button from a native window if the window has a open variabile connected the window will be closed
This commit is contained in:
Konkitoman
2023-07-24 16:15:34 +03:00
parent 4d883b8217
commit f4a196cddc
6 changed files with 106 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
crates/eframe/src/native/epi_integration.rs
View File

@@ -449,13 +449,14 @@ impl EpiIntegration {
event: &winit::event::WindowEvent<'_>,
window_id: &winit::window::WindowId,
egui_winit: &mut egui_winit::State,
viewport_id: u64,
) -> EventResponse {
use winit::event::{ElementState, MouseButton, WindowEvent};
match event {
WindowEvent::CloseRequested => {
log::debug!("Received WindowEvent::CloseRequested");
self.close = app.on_close_event();
self.close = app.on_close_event() && viewport_id == 0;
log::debug!("App::on_close_event returned {}", self.close);
}
WindowEvent::Destroyed => {

52
crates/eframe/src/native/run.rs
View File

@@ -75,7 +75,8 @@ trait WinitApp {
fn window(&self, window_id: winit::window::WindowId) -> Option<&winit::window::Window>;
fn get_window_id(&self, id: u64) -> Option<winit::window::WindowId>;
fn get_window_winit_id(&self, id: u64) -> Option<winit::window::WindowId>;
fn get_window_id(&self, id: &winit::window::WindowId) -> Option<u64>;
fn save_and_destroy(&mut self);
@@ -167,7 +168,7 @@ fn run_and_return(
}) => {
if winit_app.frame_nr() == *frame_nr {
log::trace!("UserEvent::RequestRepaint scheduling repaint at {when:?}");
if let Some(window_id) = winit_app.get_window_id(*window_id) {
if let Some(window_id) = winit_app.get_window_winit_id(*window_id) {
vec![EventResult::RepaintAt(window_id, *when)]
} else {
vec![EventResult::Wait]
@@ -320,7 +321,7 @@ fn run_and_exit(event_loop: EventLoop<UserEvent>, mut winit_app: impl WinitApp +
window_id,
}) => {
if winit_app.frame_nr() == frame_nr {
if let Some(window_id) = winit_app.get_window_id(window_id) {
if let Some(window_id) = winit_app.get_window_winit_id(window_id) {
vec![EventResult::RepaintAt(window_id, when)]
} else {
vec![EventResult::Wait]
@@ -960,7 +961,7 @@ mod glow_integration {
.flatten()
}
fn get_window_id(&self, id: u64) -> Option<winit::window::WindowId> {
fn get_window_winit_id(&self, id: u64) -> Option<winit::window::WindowId> {
self.running
.as_ref()
.map(|r| {
@@ -974,6 +975,22 @@ mod glow_integration {
.flatten()
}
fn get_window_id(&self, id: &winit::window::WindowId) -> Option<u64> {
self.running
.as_ref()
.map(|r| {
for window in r.gl_window.windows.iter() {
if let Some(win) = &window.window {
if win.id() == *id {
return Some(window.window_id);
}
}
}
None
})
.flatten()
}
fn save_and_destroy(&mut self) {
if let Some(mut running) = self.running.take() {
running
@@ -1319,7 +1336,25 @@ mod glow_integration {
}
}
winit::event::WindowEvent::CloseRequested
if running.integration.should_close() =>
if running
.gl_window
.windows
.iter()
.flat_map(|window| {
if let Some(win) = &window.window {
if win.id() == *window_id {
Some(window.window_id)
} else {
None
}
} else {
None
}
})
.flat_map(|id| if id == 0 { Some(()) } else { None })
.count()
== 1
&& running.integration.should_close() =>
{
log::debug!("Received WindowEvent::CloseRequested");
return Ok(EventResult::Exit);
@@ -1335,6 +1370,7 @@ mod glow_integration {
event,
window_id,
window.egui_winit.as_mut().unwrap(),
window.window_id,
);
}
}
@@ -1617,7 +1653,7 @@ mod wgpu_integration {
self.window.as_ref()
}
fn get_window_id(&self, id: u64) -> Option<winit::window::WindowId> {
fn get_window_winit_id(&self, id: u64) -> Option<winit::window::WindowId> {
if id == 0 {
return self.window.as_ref().map(|w| w.id());
}
@@ -1849,6 +1885,10 @@ mod wgpu_integration {
// })
//
}
fn get_window_id(&self, id: &winit::window::WindowId) -> Option<u64> {
todo!()
}
}
pub fn run_wgpu(