Skip to content

V
vlc
Commit e5d1d745 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: fixed 'video-deco' and 'embedded-video' recognition when set on the command-line

parent d74122c1
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
modules/gui/macosx/MainWindow.m
View file @ e5d1d745
...@@ -167,7 +167,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -167,7 +167,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
BOOL b_splitviewShouldBeHidden = NO; BOOL b_splitviewShouldBeHidden = NO;
/* setup the styled interface */ /* setup the styled interface */
b_video_deco = config_GetInt( VLCIntf, "video-deco" ); b_video_deco = var_InheritBool( VLCIntf, "video-deco" );
b_nativeFullscreenMode = NO; b_nativeFullscreenMode = NO;
#ifdef MAC_OS_X_VERSION_10_7 #ifdef MAC_OS_X_VERSION_10_7
if( OSX_LION && b_video_deco ) if( OSX_LION && b_video_deco )
...@@ -1819,7 +1819,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -1819,7 +1819,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
} }
else else
{ {
if ((config_GetInt( VLCIntf, "embedded-video" ) || b_nativeFullscreenMode) && b_video_deco) if ((var_InheritBool( VLCIntf, "embedded-video" ) || b_nativeFullscreenMode) && b_video_deco)
{ {
if ([o_video_view window] != self) if ([o_video_view window] != self)
{ {
...@@ -2903,7 +2903,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -2903,7 +2903,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" ); b_video_deco = var_InheritBool( VLCIntf, "video-deco" );
if (b_dark_interface || !b_video_deco) if (b_dark_interface || !b_video_deco)
{ {
......
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