vlc/vlc-2.0 | branch: master | David Fuhrmann <[email protected]> | Mon Feb 18 22:58:49 2013 +0100| [cdd7a21b28ce35618ff74f8de773362f2f06e3ac] | committer: David Fuhrmann
macosx: fix bug which hides fspanel when video on top is enabled close #8110 > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=cdd7a21b28ce35618ff74f8de773362f2f06e3ac --- modules/gui/macosx/MainWindow.m | 11 +++++++---- modules/gui/macosx/intf.m | 3 +++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m index 9b9d9b4..abd5fc7 100644 --- a/modules/gui/macosx/MainWindow.m +++ b/modules/gui/macosx/MainWindow.m @@ -1626,10 +1626,13 @@ static VLCMainWindow *_o_sharedInstance = nil; if (p_vout) { - if( var_GetBool( p_vout, "video-on-top" ) ) - [[o_video_view window] setLevel: NSStatusWindowLevel]; - else - [[o_video_view window] setLevel: NSNormalWindowLevel]; + if( !b_fullscreen ) + { + 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 ); } } diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index aa1538e..85edc8a 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -1707,6 +1707,9 @@ unsigned int CocoaKeyToVLC( unichar i_key ) - (void)setWindowLevel:(NSNumber*)state { + if ([[VLCMainWindow sharedInstance] isFullscreen]) + return; + if ([state unsignedIntValue] & VOUT_WINDOW_STATE_ABOVE) [[[[VLCMainWindow sharedInstance] videoView] window] setLevel: NSStatusWindowLevel]; else _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
