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

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
Download patch file Download diff file Expand all files Collapse all files

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

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