Mac OS X gui: Make sure the embedded window don't get shown before it is resized...

diff --git a/modules/gui/macosx/vout.h b/modules/gui/macosx/vout.h
index 5d10e6caa8e1acb054eb1d8030a5e5601c76a945..7faeb107fb76da99836a48c646ee38f248bcee7f 100644 (file)
--- a/modules/gui/macosx/vout.h
+++ b/modules/gui/macosx/vout.h
@@ -101,6 +101,9 @@
     BOOL b_used;
 }
 
+- (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view
+                 frame: (NSRect *)s_arg_frame showWindow: (BOOL)b_show_window;
+
 - (void)setUsed: (BOOL)b_new_used;
 - (BOOL)isUsed;
 

diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m
index 2d9b3a1d04b9cc0bd651582cb2ed33d6bb7b7fd8..f00daae4564d763071492635c9b1726be80cac3d 100644 (file)
--- a/modules/gui/macosx/vout.m
+++ b/modules/gui/macosx/vout.m
@@ -861,15 +861,15 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
 }
 
 - (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view
-                     frame: (NSRect *) s_arg_frame
-
+                 frame: (NSRect *)s_arg_frame showWindow: (BOOL)b_show_window
 {
     BOOL b_return;
     b_return = [super setVout: p_arg_vout subView: view frame: s_arg_frame];
     if( b_return )
     {
         o_window = [self window];
-        [o_window makeKeyAndOrderFront: self];
+        if (b_show_window)
+            [o_window makeKeyAndOrderFront: self];
         [o_window setAcceptsMouseMovedEvents: TRUE];
 
         if( var_GetBool( p_real_vout, "video-on-top" ) )
@@ -882,6 +882,13 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
     return b_return;
 }
 
+- (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view
+                     frame: (NSRect *) s_arg_frame
+
+{
+    return [self setVout: p_arg_vout subView: view frame:s_arg_frame showWindow: YES];
+}
+
 - (void)setUsed: (BOOL)b_new_used
 {
     b_used = b_new_used;
@@ -911,7 +918,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
 - (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view
                      frame: (NSRect *) s_arg_frame
 {
-    BOOL b_return = [super setVout: p_arg_vout subView: view frame: s_arg_frame];
+    BOOL b_return = [super setVout: p_arg_vout subView: view frame: s_arg_frame showWindow: NO];
 
     /* o_window needs to point to our o_embeddedwindow, super might have set it
      * to the fullscreen window that o_embeddedwindow setups during fullscreen */
@@ -922,10 +929,16 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
         [o_window setAlphaValue: var_GetFloat( p_vout, "macosx-opaqueness" )];
         [self updateTitle];
 
-        if(!([o_window isFullscreen]))
+        /* Make the window the front and key window before animating */
+        if ([o_window isVisible] && (![o_window isFullscreen]))
             [o_window makeKeyAndOrderFront: self];
 
         [self scaleWindowWithFactor: 1.0 animate: [o_window isVisible] && (![o_window isFullscreen])];
+
+        /* Make sure our window is visible, if we are not in fullscreen */
+        if (![o_window isFullscreen])
+            [o_window makeKeyAndOrderFront: self];
+
     }
     return b_return;
 }