From 0fba6563c77604bb2ffc4cf91403bdbbc128aa6c Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sun, 28 Feb 2016 10:45:56 +0200 Subject: [PATCH] Disabled fullscreen mode for OS X startup window There is no use for auxiliary fullscreen window because it behaves really weird --- src/posix/cocoa/i_common.h | 6 ++++++ src/posix/cocoa/st_console.mm | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/posix/cocoa/i_common.h b/src/posix/cocoa/i_common.h index c0986b90a..beff4a33d 100644 --- a/src/posix/cocoa/i_common.h +++ b/src/posix/cocoa/i_common.h @@ -145,6 +145,10 @@ enum static const NSOpenGLPixelFormatAttribute NSOpenGLPFAAllowOfflineRenderers = NSOpenGLPixelFormatAttribute(96); +@interface NSWindow(SetCollectionBehavior) +- (void)setCollectionBehavior:(NSUInteger)collectionBehavior; +@end + #endif // prior to 10.5 @@ -182,6 +186,8 @@ typedef NSInteger NSApplicationActivationPolicy; - (NSRect)convertRectToBacking:(NSRect)aRect; @end +static const NSWindowCollectionBehavior NSWindowCollectionBehaviorFullScreenAuxiliary = NSWindowCollectionBehavior(1 << 8); + #endif // prior to 10.7 #endif // COCOA_I_COMMON_INCLUDED diff --git a/src/posix/cocoa/st_console.mm b/src/posix/cocoa/st_console.mm index b990b9b33..5aafa3935 100644 --- a/src/posix/cocoa/st_console.mm +++ b/src/posix/cocoa/st_console.mm @@ -113,6 +113,12 @@ FConsoleWindow::FConsoleWindow() [m_window center]; [m_window exitAppOnClose]; + if (NSAppKitVersionNumber >= AppKit10_7) + { + // Do not allow fullscreen mode for this window + [m_window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenAuxiliary]; + } + [[m_window contentView] addSubview:m_scrollView]; [m_window makeKeyAndOrderFront:nil];