Commit 97a83930 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

Backport more code about [19128]. (Close the embedded window only when...

Backport more code about [19128]. (Close the embedded window only when playlist stops on Mac OS X). This part make sure the window won't be animated if it is offscreen.
parent c655f7ab
...@@ -844,15 +844,15 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -844,15 +844,15 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
} }
- (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view - (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; BOOL b_return;
b_return = [super setVout: p_arg_vout subView: view frame: s_arg_frame]; b_return = [super setVout: p_arg_vout subView: view frame: s_arg_frame];
if( b_return ) if( b_return )
{ {
o_window = [self window]; o_window = [self window];
[o_window makeKeyAndOrderFront: self]; if (b_show_window)
[o_window makeKeyAndOrderFront: self];
[o_window setAcceptsMouseMovedEvents: TRUE]; [o_window setAcceptsMouseMovedEvents: TRUE];
if( var_GetBool( p_real_vout, "video-on-top" ) ) if( var_GetBool( p_real_vout, "video-on-top" ) )
...@@ -865,6 +865,13 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -865,6 +865,13 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
return b_return; 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 - (void)setUsed: (BOOL)b_new_used
{ {
b_used = b_new_used; b_used = b_new_used;
...@@ -894,7 +901,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -894,7 +901,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
- (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view - (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view
frame: (NSRect *) s_arg_frame 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 /* o_window needs to point to our o_embeddedwindow, super might have set it
* to the fullscreen window that o_embeddedwindow setups during fullscreen */ * to the fullscreen window that o_embeddedwindow setups during fullscreen */
......
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