alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-24 06:11:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

[macos] Remove Window from EventsLoop's Window list on close and drop

Browse source 
Previously, a Window was only removed from the list when dropped.
This commit is contained in:
mitchmindtree 2017-03-19 19:20:38 +11:00
parent 41e7572147
commit 27bd796c2a
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/platform/macos/events_loop.rs
View file

@ -217,6 +217,18 @@ impl EventsLoop {
}
}
// Removes the window with the given `Id` from the `windows` list.
//
// This is called when a window is either `Closed` or `Drop`ped.
pub fn find_and_remove_window(&self, id: super::window::Id) {
if let Ok(mut windows) = self.windows.lock() {
windows.retain(|w| match w.upgrade() {
Some(w) => w.id() != id,
None => true,
});
}
}
fn call_user_callback_with_pending_events(&self) {
loop {
let event = match self.pending_events.lock().unwrap().pop_front() {

12
src/platform/macos/window.rs
View file

@ -66,6 +66,12 @@ impl WindowDelegate {
let state: *mut c_void = *this.get_ivar("winitState");
let state = &mut *(state as *mut DelegateState);
emit_event(state, WindowEvent::Closed);
// Remove the window from the events_loop.
if let Some(events_loop) = state.events_loop.upgrade() {
let window_id = get_window_id(*state.window);
events_loop.find_and_remove_window(window_id);
}
}
YES
}
@ -173,11 +179,7 @@ impl Drop for Window {
// Remove this window from the `EventLoop`s list of windows.
let id = self.id();
if let Some(ev) = self.delegate.state.events_loop.upgrade() {
let mut windows = ev.windows.lock().unwrap();
windows.retain(|w| match w.upgrade() {
Some(w) => w.id() != id,
None => true,
})
ev.find_and_remove_window(id);
}
}
}