From d38a1d804b646baa1d728668cb7cb0666c923a54 Mon Sep 17 00:00:00 2001 From: Pierre d'Herbemont Date: Tue, 22 Jul 2008 23:43:55 +0200 Subject: [PATCH] macosx: Make sure that the fspanel shows up in Float-On-Top mode. --- modules/gui/macosx/vout.m | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m index b590f817d5..1f70b786c1 100644 --- a/modules/gui/macosx/vout.m +++ b/modules/gui/macosx/vout.m @@ -881,15 +881,15 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, - (void)enterFullscreen { - [super enterFullscreen]; [o_window performSelectorOnMainThread: @selector(enterFullscreen) withObject: NULL waitUntilDone: NO]; + [super enterFullscreen]; } - (void)leaveFullscreen { - [super leaveFullscreen]; [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, [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] ) SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar); initialFrame = [self frame]; [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; } @@ -1151,6 +1153,8 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, SetSystemUIMode( kUIModeNormal, kUIOptionAutoShowMenuBar); [self setFrame:initialFrame display:YES animate:YES]; [self setMovableByWindowBackground: YES]; + if( var_GetBool( p_vout, "video-on-top" ) ) + [self setLevel: NSStatusWindowLevel]; } - (id)getVoutView // FIXME Naming scheme! -- 2.39.2