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

macOS: fix subtle regression introduced in 0474dc986 (#487)

Browse source 
* macOS: fix subtle regression introduced in 0474dc986

* update changelog
This commit is contained in:
Joe Moon 2018-04-27 21:12:50 -07:00 committed by Francesca Frangipane
parent 7aeb2c083b
commit 5761fb6b30
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -1,5 +1,6 @@
# Unreleased # Unreleased
- Fix regression of Window platform extensions for macOS where `NSFullSizeContentViewWindowMask` was not being correctly applied to `.fullsize_content_view`.
- Corrected `get_position` on Windows to be relative to the screen rather than to the taskbar. - Corrected `get_position` on Windows to be relative to the screen rather than to the taskbar.
- Corrected `Moved` event on Windows to use position values equivalent to those returned by `get_position`. It previously supplied client area positions instead of window positions, and would additionally interpret negative values as being very large (around `u16::MAX`). - Corrected `Moved` event on Windows to use position values equivalent to those returned by `get_position`. It previously supplied client area positions instead of window positions, and would additionally interpret negative values as being very large (around `u16::MAX`).
- Implemented `Moved` event on macOS. - Implemented `Moved` event on macOS.

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

@ -661,8 +661,8 @@ impl Window2 {
let masks = if pl_attrs.titlebar_hidden { let masks = if pl_attrs.titlebar_hidden {
NSWindowStyleMask::NSBorderlessWindowMask | NSWindowStyleMask::NSBorderlessWindowMask |
NSWindowStyleMask::NSResizableWindowMask NSWindowStyleMask::NSResizableWindowMask
} else if pl_attrs.titlebar_transparent { } else if !pl_attrs.titlebar_transparent {
// Window2 with a transparent titlebar and regular content view // Window2 with a titlebar
NSWindowStyleMask::NSClosableWindowMask | NSWindowStyleMask::NSClosableWindowMask |
NSWindowStyleMask::NSMiniaturizableWindowMask | NSWindowStyleMask::NSMiniaturizableWindowMask |
NSWindowStyleMask::NSResizableWindowMask | NSWindowStyleMask::NSResizableWindowMask |
@ -674,17 +674,15 @@ impl Window2 {
NSWindowStyleMask::NSResizableWindowMask | NSWindowStyleMask::NSResizableWindowMask |
NSWindowStyleMask::NSTitledWindowMask | NSWindowStyleMask::NSTitledWindowMask |
NSWindowStyleMask::NSFullSizeContentViewWindowMask NSWindowStyleMask::NSFullSizeContentViewWindowMask
} else if !attrs.decorations && !screen.is_some() {
// Window2 without a titlebar
NSWindowStyleMask::NSBorderlessWindowMask
} else { } else {
if !attrs.decorations && !screen.is_some() { // Window2 with a transparent titlebar and regular content view
// Window2 without a titlebar NSWindowStyleMask::NSClosableWindowMask |
NSWindowStyleMask::NSBorderlessWindowMask NSWindowStyleMask::NSMiniaturizableWindowMask |
} else { NSWindowStyleMask::NSResizableWindowMask |
// Window2 with a titlebar NSWindowStyleMask::NSTitledWindowMask
NSWindowStyleMask::NSClosableWindowMask |
NSWindowStyleMask::NSMiniaturizableWindowMask |
NSWindowStyleMask::NSResizableWindowMask |
NSWindowStyleMask::NSTitledWindowMask
}
}; };
let winit_window = Class::get("WinitWindow").unwrap_or_else(|| { let winit_window = Class::get("WinitWindow").unwrap_or_else(|| {