Commit 5e732fcf authored by David Fuhrmann's avatar David Fuhrmann Committed by Felix Paul Kühne

macosx: proper use of presenation options, removal of an redundant if

Signed-off-by: default avatarFelix Paul Kühne <fkuehne@videolan.org>
parent 53dfe2b3
...@@ -1335,7 +1335,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -1335,7 +1335,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
- (void)resizeWindow - (void)resizeWindow
{ {
if ( b_fullscreen || (OSX_LION && [NSApp presentationOptions] == NSApplicationPresentationFullScreen && b_nativeFullscreenMode) ) if ( b_fullscreen || (OSX_LION && [NSApp presentationOptions] & NSApplicationPresentationFullScreen && b_nativeFullscreenMode) )
return; return;
NSPoint topleftbase = NSMakePoint(0, [self frame].size.height); NSPoint topleftbase = NSMakePoint(0, [self frame].size.height);
......
...@@ -583,7 +583,7 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -583,7 +583,7 @@ static VLCMain *_o_sharedMainInstance = nil;
if (OSX_LION) if (OSX_LION)
{ {
if ([NSApp currentSystemPresentationOptions] == NSApplicationPresentationFullScreen) if ([NSApp currentSystemPresentationOptions] & NSApplicationPresentationFullScreen)
var_SetBool( p_playlist, "fullscreen", YES ); var_SetBool( p_playlist, "fullscreen", YES );
} }
......
...@@ -144,9 +144,7 @@ static NSMutableArray *blackoutWindows = NULL; ...@@ -144,9 +144,7 @@ static NSMutableArray *blackoutWindows = NULL;
[blackoutWindows addObject: blackoutWindow]; [blackoutWindows addObject: blackoutWindow];
[blackoutWindow release]; [blackoutWindow release];
if( [screen isMainScreen ] ) if( [screen isMainScreen] )
{
if ([screen isMainScreen])
{ {
if (OSX_LEOPARD) if (OSX_LEOPARD)
SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar); SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar);
...@@ -154,7 +152,6 @@ static NSMutableArray *blackoutWindows = NULL; ...@@ -154,7 +152,6 @@ static NSMutableArray *blackoutWindows = NULL;
[NSApp setPresentationOptions:(NSApplicationPresentationAutoHideDock | NSApplicationPresentationAutoHideMenuBar)]; [NSApp setPresentationOptions:(NSApplicationPresentationAutoHideDock | NSApplicationPresentationAutoHideMenuBar)];
} }
} }
}
} }
+ (void)unblackoutScreens + (void)unblackoutScreens
......
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