[vlc-commits] always hide menu bar for fullscreen on osx redacted (fixes #9040)

[David Fuhrmann]

vlc/vlc-2.0 | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Sun Jul 28 20:03:31 2013 +0200| [deabc2a183ddf070a717b64ee63caaf39851aa34] | committer: 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

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=deabc2a183ddf070a717b64ee63caaf39851aa34
---

 modules/gui/macosx/CompatibilityFixes.h |    1 +
 modules/gui/macosx/misc.m               |    5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/gui/macosx/CompatibilityFixes.h b/modules/gui/macosx/CompatibilityFixes.h
index be538c8..43c4b75 100644
--- a/modules/gui/macosx/CompatibilityFixes.h
+++ b/modules/gui/macosx/CompatibilityFixes.h
@@ -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)
diff --git a/modules/gui/macosx/misc.m b/modules/gui/macosx/misc.m
index fc0b3bf..bb8c687 100644
--- a/modules/gui/macosx/misc.m
+++ b/modules/gui/macosx/misc.m
@@ -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