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

Merge pull request #673 from ahihi/master

Browse source 
Fix fullscreen on OS X
This commit is contained in:
tomaka 2015-12-20 07:55:26 +01:00
parent 20a6e1ea6e e3cb389c6a
commit 87f0edea7b
1 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/api/cocoa/mod.rs
View file

@ -396,24 +396,22 @@ impl Window {
} }
}; };
let masks = match (attrs.decorations, attrs.transparent) { let masks = if screen.is_some() || attrs.transparent {
(true, false) => // Fullscreen or transparent window
NSBorderlessWindowMask as NSUInteger
} else if attrs.decorations {
// Classic opaque window with titlebar // Classic opaque window with titlebar
NSClosableWindowMask as NSUInteger | NSClosableWindowMask as NSUInteger |
NSMiniaturizableWindowMask as NSUInteger | NSMiniaturizableWindowMask as NSUInteger |
NSResizableWindowMask as NSUInteger | NSResizableWindowMask as NSUInteger |
NSTitledWindowMask as NSUInteger, NSTitledWindowMask as NSUInteger
(false, false) => } else {
// Opaque window without a titlebar // Opaque window without a titlebar
NSClosableWindowMask as NSUInteger | NSClosableWindowMask as NSUInteger |
NSMiniaturizableWindowMask as NSUInteger | NSMiniaturizableWindowMask as NSUInteger |
NSResizableWindowMask as NSUInteger | NSResizableWindowMask as NSUInteger |
NSTitledWindowMask as NSUInteger | NSTitledWindowMask as NSUInteger |
NSFullSizeContentViewWindowMask as NSUInteger, NSFullSizeContentViewWindowMask as NSUInteger
(_, true) =>
// Fully transparent window.
// No shadow, decorations or borders.
NSBorderlessWindowMask as NSUInteger
}; };
let window = IdRef::new(NSWindow::alloc(nil).initWithContentRect_styleMask_backing_defer_( let window = IdRef::new(NSWindow::alloc(nil).initWithContentRect_styleMask_backing_defer_(