leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FIX Crash on macOS when starting maximized without decorations (#1323)

Browse source 
* FIX #1288

* Fix CHANGELOG.md

Co-authored-by: Freya Gentz <zegentzy@protonmail.com>
This commit is contained in:
hatoo 2019-12-20 10:03:41 +09:00 • committed by Freya Gentz
parent 73248bdced
commit 38c8cb9f4a
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -1,5 +1,6 @@
# Unreleased # Unreleased
- On macOS, fix crash when starting maximized without decorations.
- On macOS, fix application not to terminate on `run_return`. - On macOS, fix application not to terminate on `run_return`.
- On Wayland, fix cursor icon updates on window borders when using CSD. - On Wayland, fix cursor icon updates on window borders when using CSD.
- On Wayland, under mutter(GNOME Wayland), fix CSD being behind the status bar, when starting window in maximized mode. - On Wayland, under mutter(GNOME Wayland), fix CSD being behind the status bar, when starting window in maximized mode.

14
src/platform_impl/macos/util/async.rs
View file

@ -60,11 +60,15 @@ pub unsafe fn set_style_mask_async(ns_window: id, ns_view: id, mask: NSWindowSty
} }
pub unsafe fn set_style_mask_sync(ns_window: id, ns_view: id, mask: NSWindowStyleMask) { pub unsafe fn set_style_mask_sync(ns_window: id, ns_view: id, mask: NSWindowStyleMask) {
let context = SetStyleMaskData::new_ptr(ns_window, ns_view, mask); let context = SetStyleMaskData::new_ptr(ns_window, ns_view, mask);
dispatch_sync_f( if msg_send![class!(NSThread), isMainThread] {
dispatch_get_main_queue(), set_style_mask_callback(context as *mut _);
context as *mut _, } else {
set_style_mask_callback, dispatch_sync_f(
); dispatch_get_main_queue(),
context as *mut _,
set_style_mask_callback,
);
}
} }
struct SetContentSizeData { struct SetContentSizeData {