vlc/vlc-1.2 | branch: master | Felix Paul Kühne <[email protected]> | Sat Jan 7 18:02:19 2012 +0100| [71d3328ff5bf19c04cee42aede79622078856832] | committer: Jean-Baptiste Kempf
macosx: make sure that the bottombar controls don't respond in Lion's native fullscreen mode (fixes #5799) (cherry picked from commit bf2aac7578db445855c33537ff4207138214dffd) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=71d3328ff5bf19c04cee42aede79622078856832 --- modules/gui/macosx/MainWindow.m | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m index 89d5fde..5a3b90c 100644 --- a/modules/gui/macosx/MainWindow.m +++ b/modules/gui/macosx/MainWindow.m @@ -1126,7 +1126,7 @@ static VLCMainWindow *_o_sharedInstance = nil; } if( OSX_LION && b_nativeFullscreenMode ) { - if( [NSApp presentationOptions] == NSApplicationPresentationFullScreen ) + if( [NSApp presentationOptions] & NSApplicationPresentationFullScreen ) [o_bottombar_view setHidden: b_videoPlayback]; else [o_bottombar_view setHidden: NO]; @@ -1704,6 +1704,9 @@ static VLCMainWindow *_o_sharedInstance = nil; winrect.size.height = winrect.size.height + f_titleBarHeight; [o_split_view setFrame: winrect]; } + + if ([[VLCMain sharedInstance] activeVideoPlayback]) + [o_bottombar_view setHidden: YES]; } - (void)windowWillExitFullScreen:(NSNotification *)notification @@ -1730,6 +1733,9 @@ static VLCMainWindow *_o_sharedInstance = nil; [o_split_view setFrame: winrect]; [o_video_view setFrame: winrect]; } + + if ([[VLCMain sharedInstance] activeVideoPlayback]) + [o_bottombar_view setHidden: NO]; } #pragma mark - _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
