shadowfacts/grass
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix hue algorithm when red == blue and red > green

Browse Source
This commit is contained in:
ConnorSkees 2020-02-14 09:46:50 -05:00
parent 65c5c209f3
commit 38802b69c5
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/color/mod.rs
View File

@ -102,7 +102,7 @@ impl Color {
(((min + max) / Number::from(2)) * Number::from(100)).round() (((min + max) / Number::from(2)) * Number::from(100)).round()
} }
pub fn as_hsla(&self) -> (Number, Number, Number, Number) { fn as_hsla(&self) -> (Number, Number, Number, Number) {
let red = self.red.clone() / Number::from(255); let red = self.red.clone() / Number::from(255);
let green = self.green.clone() / Number::from(255); let green = self.green.clone() / Number::from(255);
let blue = self.blue.clone() / Number::from(255); let blue = self.blue.clone() / Number::from(255);
@ -125,12 +125,12 @@ impl Color {
let mut hue = if min == max { let mut hue = if min == max {
Number::from(0) Number::from(0)
} else if red == max { } else if blue == max {
(green - blue) / (max - min) Number::from(4) + (red - green) / (max - min)
} else if green == max { } else if green == max {
Number::from(2) + (blue - red) / (max - min) Number::from(2) + (blue - red) / (max - min)
} else { } else {
Number::from(4) + (red - green) / (max - min) (green - blue) / (max - min)
}; };
if hue < Number::from(0) { if hue < Number::from(0) {

5
tests/color.rs
View File

@ -304,3 +304,8 @@ test!(
"a {\n color: desaturate(#855, 20%);\n}\n", "a {\n color: desaturate(#855, 20%);\n}\n",
"a {\n color: #726b6b;\n}\n" "a {\n color: #726b6b;\n}\n"
); );
test!(
desaturate_correctly_calculates_hue,
"a {\n color: desaturate(plum, 14%);\n}\n",
"a {\n color: #d4a9d4;\n}\n"
);