migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-06-27 15:13:13 -04: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
Download Patch File Download Diff File Expand all files Collapse all files

34
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
// Classic opaque window with titlebar NSBorderlessWindowMask as NSUInteger
NSClosableWindowMask as NSUInteger | } else if attrs.decorations {
NSMiniaturizableWindowMask as NSUInteger | // Classic opaque window with titlebar
NSResizableWindowMask as NSUInteger | NSClosableWindowMask as NSUInteger |
NSTitledWindowMask as NSUInteger, NSMiniaturizableWindowMask as NSUInteger |
(false, false) => NSResizableWindowMask as NSUInteger |
// Opaque window without a titlebar NSTitledWindowMask as NSUInteger
NSClosableWindowMask as NSUInteger | } else {
NSMiniaturizableWindowMask as NSUInteger | // Opaque window without a titlebar
NSResizableWindowMask as NSUInteger | NSClosableWindowMask as NSUInteger |
NSTitledWindowMask as NSUInteger | NSMiniaturizableWindowMask as NSUInteger |
NSFullSizeContentViewWindowMask as NSUInteger, NSResizableWindowMask as NSUInteger |
(_, true) => NSTitledWindowMask as NSUInteger |
// Fully transparent window. NSFullSizeContentViewWindowMask as NSUInteger
// 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_(