isolate hacks to >= 10.9

adobe · Nov 12, 2013 · 59ac8f0 · bobeast · Nov 13, 2013 · 59ac8f0
1 parent dd08f7a
commit 59ac8f0
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 13 deletions.
diff --git a/appshell/cefclient_mac.mm b/appshell/cefclient_mac.mm
@@ -217,6 +217,12 @@ - (BOOL)isFullScreenSupported {
     return (version >= 0x1070);
 }
 
+-(BOOL)needsFullScreenActivateHack {
+    SInt32 version;
+    Gestalt(gestaltSystemVersion, &version);
+    return (version >= 0x1090);
+}
+
 -(void)windowDidResize:(NSNotification *)notification
 {
 
@@ -241,20 +247,29 @@ -(void)windowDidResize:(NSNotification *)notification
 #endif
 }
 
+
 - (void)windowWillEnterFullScreen:(NSNotification *)notification {
-    [NSApp activateIgnoringOtherApps:YES];
-    [NSApp unhide:nil];
-    NSWindow* window = [notification object];
-    NSView* contentView = [window contentView];
+#ifdef DARK_UI
+    if ([self needsFullScreenActivateHack]) {
+        [NSApp activateIgnoringOtherApps:YES];
+        [NSApp unhide:nil];
+        NSWindow* window = [notification object];
+        NSView* contentView = [window contentView];
 
-    [contentView setNeedsDisplay:YES];
+        [contentView setNeedsDisplay:YES];
+    }
+#endif
 }
 
 - (void)windowDidEnterFullScreen:(NSNotification *)notification {
-    NSWindow* window = [notification object];
-    NSView* contentView = [window contentView];
-
-    [contentView setNeedsDisplay:YES];
+#ifdef DARK_UI
+    if ([self needsFullScreenActivateHack]) {
+        NSWindow* window = [notification object];
+        NSView* contentView = [window contentView];
+
+        [contentView setNeedsDisplay:YES];
+    }
+#endif
 }
 
 

diff --git a/appshell/client_handler_mac.mm b/appshell/client_handler_mac.mm
@@ -188,6 +188,13 @@ - (BOOL)isFullScreenSupported {
   return (version >= 0x1070);
 }
 
+
+-(BOOL)needsFullScreenActivateHack {
+    SInt32 version;
+    Gestalt(gestaltSystemVersion, &version);
+    return (version >= 0x1090);
+}
+
 - (void)setFullScreenButtonView:(NSView *)view {
   fullScreenButtonView = view;
 }
@@ -296,14 +303,22 @@ - (void)windowDidExitFullScreen:(NSNotification *)notification {
 
 
 - (void)windowWillEnterFullScreen:(NSNotification *)notification {
-    [NSApp activateIgnoringOtherApps:YES];
-    [NSApp unhide:nil];
+#ifdef DARK_UI
+    if ([self needsFullScreenActivateHack]) {
+        [NSApp activateIgnoringOtherApps:YES];
+        [NSApp unhide:nil];
+    }
+#endif
 }
 
 
 - (void)windowDidEnterFullScreen:(NSNotification *)notification {
-    NSView* contentView = [window contentView];
-    [contentView setNeedsDisplay:YES];
+#ifdef DARK_UI
+    if ([self needsFullScreenActivateHack]) {
+        NSView* contentView = [window contentView];
+        [contentView setNeedsDisplay:YES];
+    }
+#endif
 }
 
 // Called when the window is about to close. Perform the self-destruction