Revision: 13749
http://sourceforge.net/p/skim-app/code/13749
Author: hofman
Date: 2023-11-12 17:11:21 +0000 (Sun, 12 Nov 2023)
Log Message:
-----------
use NSAppearanceName constants, they are used inside @@available
Modified Paths:
--------------
trunk/NSGraphics_SKExtensions.m
Modified: trunk/NSGraphics_SKExtensions.m
===================================================================
--- trunk/NSGraphics_SKExtensions.m 2023-11-12 16:48:49 UTC (rev 13748)
+++ trunk/NSGraphics_SKExtensions.m 2023-11-12 17:11:21 UTC (rev 13749)
@@ -53,6 +53,9 @@
@interface NSApplication (SKMojaveExtensions) <NSAppearanceCustomization>
@end
+#define NSAppearanceNameDarkAqua @"NSAppearanceNameDarkAqua"
+#define NSAppearanceNameAccessibilityHighContrastDarkAqua
@"NSAppearanceNameAccessibilityDarkAqua"
+
#endif
BOOL SKHasDarkAppearance(id object) {
@@ -62,7 +65,7 @@
appearance = [NSAppearance currentAppearance];
else if ([object respondsToSelector:@selector(effectiveAppearance)])
appearance = [(id<NSAppearanceCustomization>)object
effectiveAppearance];
- return [[appearance
bestMatchFromAppearancesWithNames:@[@"NSAppearanceNameAqua",
@"NSAppearanceNameDarkAqua"]] isEqualToString:@"NSAppearanceNameDarkAqua"];
+ return [[appearance
bestMatchFromAppearancesWithNames:@[NSAppearanceNameAqua,
NSAppearanceNameDarkAqua]] isEqualToString:NSAppearanceNameDarkAqua];
}
return NO;
}
@@ -74,7 +77,7 @@
appearance = [NSAppearance currentAppearance];
else if ([object respondsToSelector:@selector(effectiveAppearance)])
appearance = [(id<NSAppearanceCustomization>)object
effectiveAppearance];
- return [[appearance
bestMatchFromAppearancesWithNames:@[@"NSAppearanceNameDarkAqua",
@"NSAppearanceNameAccessibilityDarkAqua"]]
isEqualToString:@"NSAppearanceNameAccessibilityDarkAqua"];
+ return [[appearance
bestMatchFromAppearancesWithNames:@[NSAppearanceNameDarkAqua,
NSAppearanceNameAccessibilityHighContrastDarkAqua]]
isEqualToString:NSAppearanceNameAccessibilityHighContrastDarkAqua];
}
return NO;
}
@@ -82,7 +85,7 @@
void SKSetHasDarkAppearance(id object) {
if (@available(macOS 10.14, *)) {
if ([object respondsToSelector:@selector(setAppearance:)])
- [(id<NSAppearanceCustomization>)object setAppearance:[NSAppearance
appearanceNamed:@"NSAppearanceNameDarkAqua"]];
+ [(id<NSAppearanceCustomization>)object setAppearance:[NSAppearance
appearanceNamed:NSAppearanceNameDarkAqua]];
}
}
@@ -89,7 +92,7 @@
void SKSetHasLightAppearance(id object) {
if (@available(macOS 10.14, *)) {
if ([object respondsToSelector:@selector(setAppearance:)])
- [(id<NSAppearanceCustomization>)object setAppearance:[NSAppearance
appearanceNamed:@"NSAppearanceNameAqua"]];
+ [(id<NSAppearanceCustomization>)object setAppearance:[NSAppearance
appearanceNamed:NSAppearanceNameAqua]];
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit