Commit 71d3328f authored by Felix Paul Kühne's avatar Felix Paul Kühne Committed by Jean-Baptiste Kempf

macosx: make sure that the bottombar controls don't respond in Lion's native...

macosx: make sure that the bottombar controls don't respond in Lion's native fullscreen mode (fixes #5799)
(cherry picked from commit bf2aac75)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent f6c874c9
...@@ -1126,7 +1126,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -1126,7 +1126,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
} }
if( OSX_LION && b_nativeFullscreenMode ) if( OSX_LION && b_nativeFullscreenMode )
{ {
if( [NSApp presentationOptions] == NSApplicationPresentationFullScreen ) if( [NSApp presentationOptions] & NSApplicationPresentationFullScreen )
[o_bottombar_view setHidden: b_videoPlayback]; [o_bottombar_view setHidden: b_videoPlayback];
else else
[o_bottombar_view setHidden: NO]; [o_bottombar_view setHidden: NO];
...@@ -1704,6 +1704,9 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -1704,6 +1704,9 @@ static VLCMainWindow *_o_sharedInstance = nil;
winrect.size.height = winrect.size.height + f_titleBarHeight; winrect.size.height = winrect.size.height + f_titleBarHeight;
[o_split_view setFrame: winrect]; [o_split_view setFrame: winrect];
} }
if ([[VLCMain sharedInstance] activeVideoPlayback])
[o_bottombar_view setHidden: YES];
} }
- (void)windowWillExitFullScreen:(NSNotification *)notification - (void)windowWillExitFullScreen:(NSNotification *)notification
...@@ -1730,6 +1733,9 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -1730,6 +1733,9 @@ static VLCMainWindow *_o_sharedInstance = nil;
[o_split_view setFrame: winrect]; [o_split_view setFrame: winrect];
[o_video_view setFrame: winrect]; [o_video_view setFrame: winrect];
} }
if ([[VLCMain sharedInstance] activeVideoPlayback])
[o_bottombar_view setHidden: NO];
} }
#pragma mark - #pragma mark -
......
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