Revision: 28187
http://sourceforge.net/p/bibdesk/svn/28187
Author: hofman
Date: 2023-03-13 15:50:08 +0000 (Mon, 13 Mar 2023)
Log Message:
-----------
use NSWorkSpace to check for high contrast, also before 10.14
Modified Paths:
--------------
trunk/bibdesk/BDSKRatingButtonCell.m
trunk/bibdesk/BDSKZoomablePDFView.m
trunk/bibdesk/NSColor_BDSKExtensions.h
trunk/bibdesk/NSColor_BDSKExtensions.m
Modified: trunk/bibdesk/BDSKRatingButtonCell.m
===================================================================
--- trunk/bibdesk/BDSKRatingButtonCell.m 2023-03-12 17:57:04 UTC (rev
28186)
+++ trunk/bibdesk/BDSKRatingButtonCell.m 2023-03-13 15:50:08 UTC (rev
28187)
@@ -349,7 +349,7 @@
borderColor = [NSColor colorWithGenericGamma22White:0.7 alpha:1.0];
[[NSColor colorWithGenericGamma22White:1.0 alpha:1.0] setFill];
}
- if (BDSKHasHighContrastAppearance(nil))
+ if (RUNNING_AFTER(10_9) && [[NSWorkspace sharedWorkspace]
accessibilityDisplayShouldIncreaseContrast])
borderColor = [NSColor controlTextColor];
[NSBezierPath fillRect:buttonRect];
[borderColor setStroke];
Modified: trunk/bibdesk/BDSKZoomablePDFView.m
===================================================================
--- trunk/bibdesk/BDSKZoomablePDFView.m 2023-03-12 17:57:04 UTC (rev 28186)
+++ trunk/bibdesk/BDSKZoomablePDFView.m 2023-03-13 15:50:08 UTC (rev 28187)
@@ -485,7 +485,7 @@
rect = [self bounds];
[NSGraphicsContext saveGraphicsState];
if ([NSScroller preferredScrollerStyle] == NSScrollerStyleLegacy) {
- BOOL isHighContrast = BDSKHasHighContrastAppearance(nil);
+ BOOL isHighContrast = (RUNNING_AFTER(10_9) && [[NSWorkspace
sharedWorkspace] accessibilityDisplayShouldIncreaseContrast]);
[[NSColor colorWithGenericGamma22White:isDark ? 0.262 : 0.981
alpha:1.0] setFill];
[NSBezierPath fillRect:rect];
[[NSColor colorWithGenericGamma22White:isHighContrast ? (isDark ?
0.686 : 0.785) : (isDark ? 0.499 : 0.905) alpha:1.0] setFill];
Modified: trunk/bibdesk/NSColor_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSColor_BDSKExtensions.h 2023-03-12 17:57:04 UTC (rev
28186)
+++ trunk/bibdesk/NSColor_BDSKExtensions.h 2023-03-13 15:50:08 UTC (rev
28187)
@@ -51,7 +51,6 @@
extern BOOL BDSKHasDarkAppearance(id object);
extern void BDSKSetHasDarkAppearance(id object);
extern void BDSKSetHasLightAppearance(id object);
-extern BOOL BDSKHasHighContrastAppearance(id object);
extern void BDSKSetHasDefaultAppearance(id object);
extern void BDSKSetAppearance(id toObject, id fromObject);
extern void BDSKRunWithAppearance(id object, void (^code)(void));
Modified: trunk/bibdesk/NSColor_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSColor_BDSKExtensions.m 2023-03-12 17:57:04 UTC (rev
28186)
+++ trunk/bibdesk/NSColor_BDSKExtensions.m 2023-03-13 15:50:08 UTC (rev
28187)
@@ -81,21 +81,6 @@
[(id<NSAppearanceCustomization>)object setAppearance:[NSAppearance
appearanceNamed:@"NSAppearanceNameAqua"]];
}
-BOOL BDSKHasHighContrastAppearance(id object) {
- if (RUNNING_AFTER(10_13)) {
- id appearance = nil;
- if (object == nil)
- appearance = [NSAppearance currentAppearance];
- else if ([object respondsToSelector:@selector(effectiveAppearance)])
- appearance = [(id<NSAppearanceCustomization>)object
effectiveAppearance];
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpartial-availability"
- return [[appearance bestMatchFromAppearancesWithNames:[NSArray
arrayWithObjects:@"NSAppearanceNameAqua", @"NSAppearanceNameDarkAqua",
@"NSAppearanceNameAccessibilityAqua", @"NSAppearanceNameAccessibilityDarkAqua",
nil]] hasPrefix:@"NSAppearanceNameAccessibility"];
-#pragma clang diagnostic pop
- }
- return NO;
-}
-
void BDSKSetHasDefaultAppearance(id object) {
if (RUNNING_AFTER(10_13) && [object
respondsToSelector:@selector(setAppearance:)])
[(id<NSAppearanceCustomization>)object setAppearance:nil];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
