vlc/vlc-2.0 | branch: master | David Fuhrmann <[email protected]> | Wed Mar 14 10:16:32 2012 +0100| [50b9f77612244abde1e23de2710977a475f104f0] | committer: David Fuhrmann
macosx: priorize native fullscreen over non-embedded window This fixes some problematic behaviour, when the user changed some settings but has still not made a restart. (cherry picked from commit 511519e3420eb716616f321f3d0bc630c2261414) Signed-off-by: David Fuhrmann <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=50b9f77612244abde1e23de2710977a475f104f0 --- modules/gui/macosx/MainWindow.m | 5 ++--- modules/gui/macosx/intf.m | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m index 1c77807..28c623d 100644 --- a/modules/gui/macosx/MainWindow.m +++ b/modules/gui/macosx/MainWindow.m @@ -126,8 +126,7 @@ static VLCMainWindow *_o_sharedInstance = nil; /* setup the styled interface */ b_nativeFullscreenMode = NO; #ifdef MAC_OS_X_VERSION_10_7 - if( config_GetInt( VLCIntf, "embedded-video" )) - b_nativeFullscreenMode = config_GetInt( VLCIntf, "macosx-nativefullscreenmode" ); + b_nativeFullscreenMode = config_GetInt( VLCIntf, "macosx-nativefullscreenmode" ); #endif i_lastShownVolume = -1; t_hide_mouse_timer = nil; @@ -1382,7 +1381,7 @@ static VLCMainWindow *_o_sharedInstance = nil; - (id)setupVideoView { vout_thread_t *p_vout = getVout(); - if (config_GetInt( VLCIntf, "embedded-video" )) + if (config_GetInt( VLCIntf, "embedded-video" ) || (OSX_LION && b_nativeFullscreenMode)) { if ([o_video_view window] != self) { diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index 1c343ab..ef3a186 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -614,8 +614,7 @@ static VLCMain *_o_sharedMainInstance = nil; /* yeah, we are done */ b_nativeFullscreenMode = NO; #ifdef MAC_OS_X_VERSION_10_7 - if( config_GetInt( VLCIntf, "embedded-video" )) - b_nativeFullscreenMode = config_GetInt( p_intf, "macosx-nativefullscreenmode" ); + b_nativeFullscreenMode = config_GetInt( p_intf, "macosx-nativefullscreenmode" ); #endif nib_main_loaded = TRUE; } _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
