colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-08-25 04:57:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Constrain CPColor components to [0.0, 1.0].

Browse Source
This commit is contained in:
Alexander Ljungberg
2012-03-10 10:11:35 +00:00
parent 9acbe0f2f8
commit 2a031e82a4
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPColor.j
+1 -1
View File
@@ -147,7 +147,7 @@ function CPColorWithImages()
*/
+ (CPColor)colorWithRed:(float)red green:(float)green blue:(float)blue alpha:(float)alpha
{
return [[CPColor alloc] _initWithRGBA:[red, green, blue, alpha]];
return [[CPColor alloc] _initWithRGBA:[MAX(0.0, MIN(1.0, red)), MAX(0.0, MIN(1.0, green)), MAX(0.0, MIN(1.0, blue)), MAX(0.0, MIN(1.0, alpha))]];
}
/*!
Tests/AppKit/CPColorTest.j
+17 -1
View File
@@ -26,7 +26,7 @@
// Based on https://gist.github.com/e06f749362cb1166439f by spakanati.
var color1 = [CPColor colorWithCSSString:"rgba(127,127,127,1.0)"],
color2 = [CPColor colorWithCSSString:"rgba(127, 127, 127, 1.0)"],
color3 = [CPColor colorWithRed:127.0/255.0 green:127.0/255.0 blue:127.0/255.0 alpha:1.0],
color3 = [CPColor colorWithRed:127.0 / 255.0 green:127.0 / 255.0 blue:127.0 / 255.0 alpha:1.0],
color4 = [CPColor blackColor];
[self assertTrue:[color1 isEqual:color2] message:"[color1 isEqual:color2]"];
@@ -51,4 +51,20 @@
[self assertFalse:[color4 isEqual:color5] message:"![color4 isEqual:color5]"];
}
- (void)testOutOfRange
{
var color1 = [CPColor colorWithCalibratedRed:-1.0 green:-1.0 blue:-1.0 alpha:-.05],
color2 = [CPColor colorWithCalibratedRed:1.1 green:1.2 blue:1.3 alpha:1.05];
[self assert:0.0 equals:[color1 redComponent] message:"color1 redComponent"];
[self assert:0.0 equals:[color1 greenComponent] message:"color1 greenComponent"];
[self assert:0.0 equals:[color1 blueComponent] message:"color1 blueComponent"];
[self assert:0.0 equals:[color1 alphaComponent] message:"color1 alphaComponent"];
[self assert:1.0 equals:[color2 redComponent] message:"color2 redComponent"];
[self assert:1.0 equals:[color2 greenComponent] message:"color2 greenComponent"];
[self assert:1.0 equals:[color2 blueComponent] message:"color2 blueComponent"];
[self assert:1.0 equals:[color2 alphaComponent] message:"color2 alphaComponent"];
}
@end