Commit 40049647 authored by Felix Paul Kühne's avatar Felix Paul Kühne

gui/macosx: adapted fspanel and embeddedwindow to the changes in [24189] (also refs #1427)

parent a26d9914
...@@ -176,16 +176,15 @@ ...@@ -176,16 +176,15 @@
vout_thread_t *p_vout = vlc_object_find( VLCIntf, VLC_OBJECT_VOUT, FIND_ANYWHERE ); vout_thread_t *p_vout = vlc_object_find( VLCIntf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
BOOL blackout_other_displays = var_GetBool( p_vout, "macosx-black" ); BOOL blackout_other_displays = var_GetBool( p_vout, "macosx-black" );
screen = [[NSScreen screens] objectAtIndex: var_GetInteger( p_vout, "video-device" )]; screen = [NSScreen screenWithDisplayID: (CGDirectDisplayID)var_GetInteger( p_vout, "video-device" )];
if( !screen )
[self lockFullscreenAnimation];
if(! screen )
{ {
msg_Dbg( p_vout, "chosen screen isn't present, using current screen for fullscreen mode" ); msg_Dbg( p_vout, "chosen screen isn't present, using current screen for fullscreen mode" );
screen = [self screen]; screen = [self screen];
} }
[self lockFullscreenAnimation];
vlc_object_release( p_vout ); vlc_object_release( p_vout );
screen_rect = [screen frame]; screen_rect = [screen frame];
...@@ -249,7 +248,7 @@ ...@@ -249,7 +248,7 @@
[o_fullscreen_window setAcceptsMouseMovedEvents: TRUE]; [o_fullscreen_window setAcceptsMouseMovedEvents: TRUE];
/* tell the fspanel to move itself to front next time it's triggered */ /* tell the fspanel to move itself to front next time it's triggered */
[[[[VLCMain sharedInstance] getControls] getFSPanel] setVoutWasUpdated: (int)[[o_fullscreen_window screen] displayID]]; [[[[VLCMain sharedInstance] getControls] getFSPanel] setVoutWasUpdated: [o_fullscreen_window screen]];
[super orderOut: self]; [super orderOut: self];
......
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