Commit b0ac1fc6 authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: fixed fullscreen mode when linking against older SDKs (fixes #5857)

parent 7a28f193
......@@ -121,10 +121,10 @@ static VLCMainWindow *_o_sharedInstance = nil;
- (void)awakeFromNib
{
/* setup the styled interface */
#ifdef MAC_OS_X_VERSION_10_7
b_nativeFullscreenMode = config_GetInt( VLCIntf, "macosx-nativefullscreenmode" );
#else
#ifndef MAC_OS_X_VERSION_10_7
b_nativeFullscreenMode = NO;
#else
b_nativeFullscreenMode = config_GetInt( VLCIntf, "macosx-nativefullscreenmode" );
#endif
i_lastShownVolume = -1;
t_hide_mouse_timer = nil;
......@@ -1491,7 +1491,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
[o_fullscreen_btn setState: NO];
/* We always try to do so */
if (!(OSX_LION && b_nativeFullscreenMode))
if (!(OSX_LION || !b_nativeFullscreenMode))
[NSScreen unblackoutScreens];
vout_thread_t *p_vout = getVout();
if (p_vout)
......@@ -1656,7 +1656,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
- (void)orderOut: (id)sender
{
/* Make sure we leave fullscreen */
if (!(OSX_LION && b_nativeFullscreenMode))
if (!(OSX_LION || !b_nativeFullscreenMode))
[self leaveFullscreenAndFadeOut: YES];
[super orderOut: sender];
......
......@@ -614,7 +614,10 @@ static VLCMain *_o_sharedMainInstance = nil;
[o_msgs_refresh_btn setImage: [NSImage imageNamed: NSImageNameRefreshTemplate]];
/* yeah, we are done */
b_nativeFullscreenMode = NO;
#ifdef MAC_OS_X_VERSION_10_7
b_nativeFullscreenMode = config_GetInt( p_intf, "macosx-nativefullscreenmode" );
#endif
nib_main_loaded = TRUE;
}
......
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