Ticket #2262: contrastingColor.diff

Frameworks/AIUtilities

@@ -259 +259 @@
-    return ([[self colorUsingColorSpaceName:NSCalibratedRGBColorSpace] brightnessComponent] < 0.5);
-}
-
+- (BOOL)colorIsMedium
+{
+        float brightness = [[self colorUsingColorSpaceName:NSCalibratedRGBColorSpace] brightnessComponent];
+        return (0.35 < brightness && brightness < 0.65);
+}
+
-//Percent should be -1.0 to 1.0 (negatives will make the color brighter)
-- (NSColor *)darkenBy:(float)amount
-{
@@ -313 +319 @@
-    return [NSColor colorWithCalibratedHue:h luminance:l saturation:s alpha:1.0];
-}
-
+//Returns a color that contrasts well with this one
+- (NSColor *)contrastingColor
+{
+        if ([self colorIsMedium]) {
+                if ([self colorIsDark])
+                        return [NSColor whiteColor];
+                else
+                        return [NSColor blackColor];
+        } else {
+                return [NSColor colorWithCalibratedRed:1.0 - [self redComponent]
+                                                           green:1.0 - [self greenComponent]
+                                                            blue:1.0 - [self blueComponent]
+                                                           alpha:1.0];
+        }
+}
+
-- (void)getHue:(float *)hue luminance:(float *)luminance saturation:(float *)saturation
-{
-    NSColor     *rgbColor;

Frameworks/AIUtilities

@@ -39 +39 @@
-+ (NSControlTint)currentControlTintSupportingJag;
-- (BOOL)equalToRGBColor:(NSColor *)inColor;
-- (BOOL)colorIsDark;
+- (BOOL)colorIsMedium;
-- (NSColor *)darkenBy:(float)amount;
-- (NSColor *)darkenAndAdjustSaturationBy:(float)amount;
-- (NSString *)hexString;
@@ -46 +47 @@
-- (void)getHue:(float *)hue luminance:(float *)luminance saturation:(float *)saturation;
-+ (NSColor *)colorWithCalibratedHue:(float)hue luminance:(float)luminance saturation:(float)saturation alpha:(float)alpha;
-- (NSColor *)colorWithInvertedLuminance;
+- (NSColor *)contrastingColor;
-- (NSColor *)adjustHue:(float)dHue saturation:(float)dSat brightness:(float)dBrit;
-
-//these use arc4random() for their random numbers. there is no need to seed anything.

Frameworks/Adium

@@ -354 +354 @@
-                [self setBackgroundColor:cachedWhiteColor];
-        }
-        
-lorWithInvertedLuminance
+ntrastingColor
-}
-
-//Paste as rich text without altering our typing attributes