migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-09-02 06:40:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

macOS: fix subtle regression introduced in 0474dc986

Browse Source
This commit is contained in:
Joe Moon
2018-04-27 17:38:57 -07:00
parent 4641433c6a
commit 03c3e79409
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -634,8 +634,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 |
@@ -647,17 +647,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(|| {