vlc | branch: master | Felix Paul Kühne <fkue...@videolan.org> | Sun Jan 15 17:13:16 2012 +0100| [b0ac1fc6a24b2835d4af359a7d3847c80b0a3e9b] | committer: Felix Paul Kühne
macosx: fixed fullscreen mode when linking against older SDKs (fixes #5857) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b0ac1fc6a24b2835d4af359a7d3847c80b0a3e9b --- modules/gui/macosx/MainWindow.m | 10 +++++----- modules/gui/macosx/intf.m | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m index a4500fc..6864ec2 100644 --- a/modules/gui/macosx/MainWindow.m +++ b/modules/gui/macosx/MainWindow.m @@ -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]; diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index 143c3e4..705da58 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -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; } _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
