aboutsummaryrefslogtreecommitdiffstats
path: root/src/api
diff options
context:
space:
mode:
authorMiranda Kastemaa <miranda@foldplop.com>2015-12-11 23:23:23 +0200
committerMiranda Kastemaa <miranda@foldplop.com>2015-12-11 23:23:23 +0200
commite3cb389c6a08f4aecac6f93ed3ecd56327149c8b (patch)
tree3914bc6d1a4fac2401b932b946d3736454c2a5c7 /src/api
parent4f0aeafbed98e62515f5d10108f377a9b188cb4c (diff)
downloadglutin-e3cb389c6a08f4aecac6f93ed3ecd56327149c8b.tar.gz
glutin-e3cb389c6a08f4aecac6f93ed3ecd56327149c8b.zip
Fix fullscreen on OS X
Diffstat (limited to 'src/api')
-rw-r--r--src/api/cocoa/mod.rs36
1 files changed, 17 insertions, 19 deletions
diff --git a/src/api/cocoa/mod.rs b/src/api/cocoa/mod.rs
index b7e0239..c9e35a8 100644
--- a/src/api/cocoa/mod.rs
+++ b/src/api/cocoa/mod.rs
@@ -396,26 +396,24 @@ impl Window {
}
};
- let masks = match (attrs.decorations, attrs.transparent) {
- (true, false) =>
- // Classic opaque window with titlebar
- NSClosableWindowMask as NSUInteger |
- NSMiniaturizableWindowMask as NSUInteger |
- NSResizableWindowMask as NSUInteger |
- NSTitledWindowMask as NSUInteger,
- (false, false) =>
- // Opaque window without a titlebar
- NSClosableWindowMask as NSUInteger |
- NSMiniaturizableWindowMask as NSUInteger |
- NSResizableWindowMask as NSUInteger |
- NSTitledWindowMask as NSUInteger |
- NSFullSizeContentViewWindowMask as NSUInteger,
- (_, true) =>
- // Fully transparent window.
- // No shadow, decorations or borders.
- NSBorderlessWindowMask as NSUInteger
+ let masks = if screen.is_some() || attrs.transparent {
+ // Fullscreen or transparent window
+ NSBorderlessWindowMask as NSUInteger
+ } else if attrs.decorations {
+ // Classic opaque window with titlebar
+ NSClosableWindowMask as NSUInteger |
+ NSMiniaturizableWindowMask as NSUInteger |
+ NSResizableWindowMask as NSUInteger |
+ NSTitledWindowMask as NSUInteger
+ } else {
+ // Opaque window without a titlebar
+ NSClosableWindowMask as NSUInteger |
+ NSMiniaturizableWindowMask as NSUInteger |
+ NSResizableWindowMask as NSUInteger |
+ NSTitledWindowMask as NSUInteger |
+ NSFullSizeContentViewWindowMask as NSUInteger
};
-
+
let window = IdRef::new(NSWindow::alloc(nil).initWithContentRect_styleMask_backing_defer_(
frame,
masks,