Commit deabc2a1 authored by David Fuhrmann's avatar David Fuhrmann

always hide menu bar for fullscreen on osx redacted (fixes #9040)

(cherry picked from commit 4ebe98116b867af109d051c376b266653b224923)

Conflicts:
	modules/gui/macosx/CompatibilityFixes.h
	modules/gui/macosx/intf.m
parent ea398f36
......@@ -29,6 +29,7 @@
#define OSX_SNOW_LEOPARD (NSAppKitVersionNumber < 1115 && NSAppKitVersionNumber >= 1038)
#define OSX_LION (NSAppKitVersionNumber >= 1115.2)
#define OSX_MOUNTAIN_LION NSAppKitVersionNumber >= 1162
#define OSX_REDACTED NSAppKitVersionNumber >= 1244
#pragma mark -
#pragma Fixes for OS X Leopard (10.5)
......
......@@ -92,7 +92,10 @@ static NSMutableArray *blackoutWindows = NULL;
- (BOOL)isMainScreen
{
return ([self displayID] == [[[NSScreen screens] objectAtIndex:0] displayID]);
if (OSX_REDACTED)
return YES;
else
return ([self displayID] == [[[NSScreen screens] objectAtIndex:0] displayID]);
}
- (BOOL)isScreen: (NSScreen*)screen
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment