- frame.size.height = videoFrame.size.height;
- videoFrame.origin.y = .0;
- videoFrame.origin.x = .0;
- [o_video_view setFrame: videoFrame];
+ if ([o_video_view superview] != NULL)
+ [o_video_view removeFromSuperviewWithoutNeedingDisplay];
+
+ NSRect frame = [o_detached_video_window frame];
+ NSRect videoFrame = [o_video_view frame];
+ frame.size.width = videoFrame.size.width;
+ if (b_video_deco)
+ frame.size.height = videoFrame.size.height + [o_detached_bottombar_view frame].size.height + [o_titlebar_view frame].size.height;
+ else
+ {
+ frame.size.height = videoFrame.size.height;
+ videoFrame.origin.y = .0;
+ videoFrame.origin.x = .0;
+ [o_video_view setFrame: videoFrame];
+ }
+ [o_detached_video_window setFrame: frame display: NO];
+ [[o_detached_video_window contentView] addSubview: o_video_view positioned:NSWindowAbove relativeTo:nil];
+ [o_detached_video_window setLevel:NSNormalWindowLevel];
+ [o_detached_video_window useOptimizedDrawing: YES];
+ [o_detached_video_window center];
+ b_nonembedded = YES;
+ }
+
+ [[o_video_view window] makeKeyAndOrderFront: self];
+
+ vout_thread_t *p_vout = getVout();
+ if (p_vout)
+ {
+ if( var_GetBool( p_vout, "video-on-top" ) )
+ [[o_video_view window] setLevel: NSStatusWindowLevel];
+ else
+ [[o_video_view window] setLevel: NSNormalWindowLevel];
+ vlc_object_release( p_vout );