|
@@ -47,7 +47,7 @@ static const CGFloat kGTMLuminanceDarkCutoff = 0.6;
|
|
return [self colorUsingColorSpace:[NSColorSpace gtm_labColorSpace]];
|
|
return [self colorUsingColorSpace:[NSColorSpace gtm_labColorSpace]];
|
|
}
|
|
}
|
|
|
|
|
|
-- (CGFloat)gtm_luminance {
|
|
|
|
|
|
+- (CGFloat)km_luminance {
|
|
CGFloat lab[4];
|
|
CGFloat lab[4];
|
|
lab[0] = 0.0;
|
|
lab[0] = 0.0;
|
|
[[self labColor] getComponents:lab];
|
|
[[self labColor] getComponents:lab];
|
|
@@ -133,7 +133,7 @@ const CGFloat kDefaultFade = 0.3;
|
|
- (NSColor *)km_colorAdjustedFor:(GTMColorationUse)use faded:(BOOL)fade {
|
|
- (NSColor *)km_colorAdjustedFor:(GTMColorationUse)use faded:(BOOL)fade {
|
|
NSColor *color = [self km_colorAdjustedFor:use];
|
|
NSColor *color = [self km_colorAdjustedFor:use];
|
|
if (fade) {
|
|
if (fade) {
|
|
- CGFloat luminance = [color gtm_luminance];
|
|
|
|
|
|
+ CGFloat luminance = [color km_luminance];
|
|
color = [color km_colorByAdjustingLuminance:
|
|
color = [color km_colorByAdjustingLuminance:
|
|
kDefaultFade * (1.0 - luminance)
|
|
kDefaultFade * (1.0 - luminance)
|
|
saturation:kDefaultFade];
|
|
saturation:kDefaultFade];
|
|
@@ -142,7 +142,7 @@ const CGFloat kDefaultFade = 0.3;
|
|
}
|
|
}
|
|
|
|
|
|
- (BOOL)gtm_isDarkColor {
|
|
- (BOOL)gtm_isDarkColor {
|
|
- return [self gtm_luminance] < kGTMLuminanceDarkCutoff;
|
|
|
|
|
|
+ return [self km_luminance] < kGTMLuminanceDarkCutoff;
|
|
}
|
|
}
|
|
|
|
|
|
- (NSColor *)gtm_legibleTextColor {
|
|
- (NSColor *)gtm_legibleTextColor {
|