Commit f3239670 authored by Felix Paul Kühne's avatar Felix Paul Kühne Committed by Felix Paul Kühne

macosx: remove debug code and block Lion's fullscreen mode when disabling 'video-deco'

Thanks to David Fuhrmann for the remarks
(cherry picked from commit 5003db864a87d4d9a017939945df29b03bb76ac2)
parent e6d7a9db
...@@ -128,11 +128,9 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -128,11 +128,9 @@ static VLCMainWindow *_o_sharedInstance = nil;
/* setup the styled interface */ /* setup the styled interface */
b_video_deco = config_GetInt( VLCIntf, "video-deco" ); b_video_deco = config_GetInt( VLCIntf, "video-deco" );
if (b_video_deco)
b_nonembedded = YES;
b_nativeFullscreenMode = NO; b_nativeFullscreenMode = NO;
#ifdef MAC_OS_X_VERSION_10_7 #ifdef MAC_OS_X_VERSION_10_7
if( OSX_LION ) if( OSX_LION && b_video_deco )
b_nativeFullscreenMode = config_GetInt( VLCIntf, "macosx-nativefullscreenmode" ); b_nativeFullscreenMode = config_GetInt( VLCIntf, "macosx-nativefullscreenmode" );
#endif #endif
i_lastShownVolume = -1; i_lastShownVolume = -1;
...@@ -2515,6 +2513,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -2515,6 +2513,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
backing:(NSBackingStoreType)backingType defer:(BOOL)flag backing:(NSBackingStoreType)backingType defer:(BOOL)flag
{ {
b_dark_interface = config_GetInt( VLCIntf, "macosx-interfacestyle" ); b_dark_interface = config_GetInt( VLCIntf, "macosx-interfacestyle" );
b_video_deco = config_GetInt( VLCIntf, "video-deco" );
if (b_dark_interface || !b_video_deco) if (b_dark_interface || !b_video_deco)
{ {
...@@ -2528,11 +2527,6 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -2528,11 +2527,6 @@ static VLCMainWindow *_o_sharedInstance = nil;
#endif #endif
} }
b_video_deco = config_GetInt( VLCIntf, "video-deco" );
if (b_video_deco)
self = [super initWithContentRect:contentRect styleMask:styleMask
backing:backingType defer:flag];
else
self = [super initWithContentRect:contentRect styleMask:styleMask self = [super initWithContentRect:contentRect styleMask:styleMask
backing:backingType defer:flag]; backing:backingType defer:flag];
......
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