macosx: Make sure we don't see a grey flash in float-on-top mode in embedded window.

diff --git a/modules/gui/macosx/embeddedwindow.h b/modules/gui/macosx/embeddedwindow.h
index c31aa48e5f755608de8dd4ef87a6f2ad00553050..f451b51697d4f896b1e6a6ad0bd4a9324a1f6167 100644 (file)
--- a/modules/gui/macosx/embeddedwindow.h
+++ b/modules/gui/macosx/embeddedwindow.h
@@ -53,6 +53,7 @@
     BOOL              b_window_is_invisible;
 
     NSSize videoRatio;
+    NSInteger originalLevel;
 }
 
 - (void)controlTintChanged;

diff --git a/modules/gui/macosx/embeddedwindow.m b/modules/gui/macosx/embeddedwindow.m
index 5fceaa999635c2d6a392bd86ae895a08ac656000..a4d98e8d7c342421f8e702e1dd8f504059046721 100644 (file)
--- a/modules/gui/macosx/embeddedwindow.m
+++ b/modules/gui/macosx/embeddedwindow.m
@@ -245,6 +245,10 @@
     if( blackout_other_displays )        
         [screen blackoutOtherScreens];
 
+    /* Make sure we don't see the window flashes in float-on-top mode */
+    originalLevel = [self level];
+    [self setLevel:NSNormalWindowLevel];
+
     /* Only create the o_fullscreen_window if we are not in the middle of the zooming animation */
     if (!o_fullscreen_window)
     {
@@ -506,6 +510,8 @@
 
     [o_fullscreen_window release];
     o_fullscreen_window = nil;
+    [self setLevel:originalLevel];
+
     [self unlockFullscreenAnimation];
 }