alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2025-01-12 05:31:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #247 from zpgaal/issue_240_simple

Browse source 
Issue 240 alternative fix
This commit is contained in:
tomaka 2017-07-31 19:32:33 +02:00 committed by GitHub
parent a14bae8742 d868510cc8
commit 718e0f8551
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/platform/windows/events_loop.rs
View file

@ -281,7 +281,7 @@ pub unsafe extern "system" fn callback(window: winapi::HWND, msg: winapi::UINT,
-> winapi::LRESULT -> winapi::LRESULT
{ {
match msg { match msg {
winapi::WM_DESTROY => { winapi::WM_CLOSE => {
use events::WindowEvent::Closed; use events::WindowEvent::Closed;
send_event(Event::WindowEvent { send_event(Event::WindowEvent {
window_id: SuperWindowId(WindowId(window)), window_id: SuperWindowId(WindowId(window)),
@ -291,7 +291,7 @@ pub unsafe extern "system" fn callback(window: winapi::HWND, msg: winapi::UINT,
let mut context_stash = context_stash.borrow_mut(); let mut context_stash = context_stash.borrow_mut();
context_stash.as_mut().unwrap().windows.remove(&window); context_stash.as_mut().unwrap().windows.remove(&window);
}); });
0 user32::DefWindowProcW(window, msg, wparam, lparam)
}, },
winapi::WM_ERASEBKGND => { winapi::WM_ERASEBKGND => {

4
src/platform/windows/window.rs
View file

@ -282,7 +282,9 @@ impl Drop for Window {
#[inline] #[inline]
fn drop(&mut self) { fn drop(&mut self) {
unsafe { unsafe {
user32::PostMessageW(self.window.0, winapi::WM_DESTROY, 0, 0); // We are sending WM_CLOSE, and our callback will process this by calling DefWindowProcW,
// which in turn will send a WM_DESTROY.
user32::PostMessageW(self.window.0, winapi::WM_CLOSE, 0, 0);
} }
} }
} }