[vlc-commits] macosx: disable native fullscreen checkbox only once

David Fuhrmann git at videolan.org
Tue Mar 13 14:18:45 CET 2012


vlc/vlc-2.0 | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Tue Mar 13 13:24:01 2012 +0100| [193bb48cfd793bcbd48f148107c8e3e958aa1ef9] | committer: David Fuhrmann

macosx: disable native fullscreen checkbox only once
(cherry picked from commit 5ff8299fade511fbee60df13f0dfaf94d72d5fd6)

Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=193bb48cfd793bcbd48f148107c8e3e958aa1ef9
---

 modules/gui/macosx/simple_prefs.m |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index 6d40238..b5627c8 100644
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -134,11 +134,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
 
     if (OSX_LION)
         [o_sprefs_win setCollectionBehavior: NSWindowCollectionBehaviorFullScreenAuxiliary];
-    else
-        [o_intf_nativefullscreen_ckb setEnabled:NO];
-#ifndef MAC_OS_X_VERSION_10_7
-    [o_intf_nativefullscreen_ckb setEnabled:NO];
-#endif
 
     [o_hotkeys_listbox setTarget:self];
     [o_hotkeys_listbox setDoubleAction:@selector(hotkeyTableDoubleClick:)];
@@ -472,7 +467,7 @@ static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_na
 #ifdef MAC_OS_X_VERSION_10_7
     b_correct_sdk = YES;
 #endif
-    if( !b_correct_sdk || !OSX_LION )
+    if( !( b_correct_sdk && OSX_LION ))
     {
         [o_intf_nativefullscreen_ckb setState: NSOffState];
         [o_intf_nativefullscreen_ckb setEnabled: NO];



More information about the vlc-commits mailing list