Commit e5660d61 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files

macosx: tweak conditional code handling

parent a8ae0bd0
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
{ {
b_nativeFullscreenMode = var_InheritBool(getIntf(), "macosx-nativefullscreenmode"); b_nativeFullscreenMode = var_InheritBool(getIntf(), "macosx-nativefullscreenmode");
if (!b_nativeFullscreenMode || OSX_YOSEMITE || OSX_EL_CAPITAN) { if (!b_nativeFullscreenMode || OSX_YOSEMITE || OSX_EL_CAPITAN || OSX_SIERRA) {
[_fullscreenButton setHidden: YES]; [_fullscreenButton setHidden: YES];
} }
......
...@@ -532,7 +532,7 @@ NSString *toNSStr(const char *str) { ...@@ -532,7 +532,7 @@ NSString *toNSStr(const char *str) {
NSImage *imageFromRes(NSString *o_id) NSImage *imageFromRes(NSString *o_id)
{ {
NSString *result = @""; NSString *result = @"";
if (OSX_YOSEMITE || OSX_EL_CAPITAN) { if (OSX_YOSEMITE || OSX_EL_CAPITAN || OSX_SIERRA) {
result = [result stringByAppendingString:@"ys-"]; result = [result stringByAppendingString:@"ys-"];
} }
......
...@@ -334,7 +334,7 @@ ...@@ -334,7 +334,7 @@
if (b_nativeFullscreenMode) { if (b_nativeFullscreenMode) {
[self setCollectionBehavior: NSWindowCollectionBehaviorFullScreenPrimary]; [self setCollectionBehavior: NSWindowCollectionBehaviorFullScreenPrimary];
} else if (OSX_EL_CAPITAN) { } else if (OSX_EL_CAPITAN || OSX_SIERRA) {
// Native fullscreen seems to be default on El Capitan, this disables it explicitely // Native fullscreen seems to be default on El Capitan, this disables it explicitely
[self setCollectionBehavior: NSWindowCollectionBehaviorFullScreenAuxiliary]; [self setCollectionBehavior: NSWindowCollectionBehaviorFullScreenAuxiliary];
} }
......
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
"\"http://www.videolan.org/contribute/\"><span style=\" text-decoration: " "\"http://www.videolan.org/contribute/\"><span style=\" text-decoration: "
"underline; color:#0057ae;\">Help and join us!</span></a>")); "underline; color:#0057ae;\">Help and join us!</span></a>"));
NSString *fontfamily; NSString *fontfamily;
if (OSX_YOSEMITE || OSX_EL_CAPITAN) if (OSX_YOSEMITE || OSX_EL_CAPITAN || OSX_SIERRA)
fontfamily = @"Helvetica Neue"; fontfamily = @"Helvetica Neue";
else else
fontfamily = @"Lucida Grande"; fontfamily = @"Lucida Grande";
......
...@@ -173,7 +173,7 @@ static bool b_old_spaces_style = YES; ...@@ -173,7 +173,7 @@ static bool b_old_spaces_style = YES;
/* init our fake object attribute */ /* init our fake object attribute */
blackoutWindows = [[NSMutableArray alloc] initWithCapacity:1]; blackoutWindows = [[NSMutableArray alloc] initWithCapacity:1];
if (OSX_MAVERICKS || OSX_YOSEMITE || OSX_EL_CAPITAN) { if (!OSX_LION && !OSX_MOUNTAIN_LION) {
NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init]; NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
[userDefaults addSuiteNamed:@"com.apple.spaces"]; [userDefaults addSuiteNamed:@"com.apple.spaces"];
/* this is system settings -> mission control -> monitors using different spaces */ /* this is system settings -> mission control -> monitors using different spaces */
......
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