Commit d38a1d80 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

macosx: Make sure that the fspanel shows up in Float-On-Top mode.

parent 4081f99f
...@@ -881,15 +881,15 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -881,15 +881,15 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
- (void)enterFullscreen - (void)enterFullscreen
{ {
[super enterFullscreen];
[o_window performSelectorOnMainThread: @selector(enterFullscreen) withObject: NULL waitUntilDone: NO]; [o_window performSelectorOnMainThread: @selector(enterFullscreen) withObject: NULL waitUntilDone: NO];
[super enterFullscreen];
} }
- (void)leaveFullscreen - (void)leaveFullscreen
{ {
[super leaveFullscreen];
[o_window performSelectorOnMainThread: @selector(leaveFullscreen) withObject: NULL waitUntilDone: NO]; [o_window performSelectorOnMainThread: @selector(leaveFullscreen) withObject: NULL waitUntilDone: NO];
[super leaveFullscreen];
} }
...@@ -1128,15 +1128,17 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -1128,15 +1128,17 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
[self setMovableByWindowBackground: NO]; [self setMovableByWindowBackground: NO];
/* tell the fspanel to move itself to front next time it's triggered */
[[[[VLCMain sharedInstance] getControls] getFSPanel] setVoutWasUpdated: i_device];
[[[[VLCMain sharedInstance] getControls] getFSPanel] setActive: nil];
if( [screen isMainScreen] ) if( [screen isMainScreen] )
SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar); SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar);
initialFrame = [self frame]; initialFrame = [self frame];
[self setFrame:[screen frame] display:YES animate:YES]; [self setFrame:[screen frame] display:YES animate:YES];
[self setLevel:NSNormalWindowLevel];
/* tell the fspanel to move itself to front next time it's triggered */
[[[[VLCMain sharedInstance] getControls] getFSPanel] setVoutWasUpdated: i_device];
[[[[VLCMain sharedInstance] getControls] getFSPanel] setActive: nil];
fullscreen = YES; fullscreen = YES;
} }
...@@ -1151,6 +1153,8 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -1151,6 +1153,8 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
SetSystemUIMode( kUIModeNormal, kUIOptionAutoShowMenuBar); SetSystemUIMode( kUIModeNormal, kUIOptionAutoShowMenuBar);
[self setFrame:initialFrame display:YES animate:YES]; [self setFrame:initialFrame display:YES animate:YES];
[self setMovableByWindowBackground: YES]; [self setMovableByWindowBackground: YES];
if( var_GetBool( p_vout, "video-on-top" ) )
[self setLevel: NSStatusWindowLevel];
} }
- (id)getVoutView // FIXME Naming scheme! - (id)getVoutView // FIXME Naming scheme!
......
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