jatria-soft/etk
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[DEBUG] correct color parsing

Browse Source
This commit is contained in:
Edouard DUPIN 2021-04-13 23:02:28 +02:00
parent d2c142485a
commit 48f1500d43
1 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/org/atriasoft/etk/Color.java
View File

@ -335,29 +335,29 @@ public record Color(
// #RRGGBBAA // #RRGGBBAA
switch (color.length()) { switch (color.length()) {
case 4 -> { case 4 -> {
final float r = Integer.parseInt(color.substring(1, 2), 16) * 255.0f * 16.0f; final float r = Integer.parseInt(color.substring(1, 2), 16) / 15.0f;
final float g = Integer.parseInt(color.substring(2, 3), 16) * 255.0f * 16.0f; final float g = Integer.parseInt(color.substring(2, 3), 16) / 15.0f;
final float b = Integer.parseInt(color.substring(3, 4), 16) * 255.0f * 16.0f; final float b = Integer.parseInt(color.substring(3, 4), 16) / 15.0f;
return new Color(r, g, b); return new Color(r, g, b);
} }
case 5 -> { case 5 -> {
final float r = Integer.parseInt(color.substring(1, 2), 16) * 255.0f * 16.0f; final float r = Integer.parseInt(color.substring(1, 2), 16) / 15.0f;
final float g = Integer.parseInt(color.substring(2, 3), 16) * 255.0f * 16.0f; final float g = Integer.parseInt(color.substring(2, 3), 16) / 15.0f;
final float b = Integer.parseInt(color.substring(3, 4), 16) * 255.0f * 16.0f; final float b = Integer.parseInt(color.substring(3, 4), 16) / 15.0f;
final float a = Integer.parseInt(color.substring(4, 5), 16) * 255.0f * 16.0f; final float a = Integer.parseInt(color.substring(4, 5), 16) / 15.0f;
return new Color(r, g, b, a); return new Color(r, g, b, a);
} }
case 7 -> { case 7 -> {
final float r = Integer.parseInt(color.substring(1, 3), 16) * 255.0f; final float r = Integer.parseInt(color.substring(1, 3), 16) / 255.0f;
final float g = Integer.parseInt(color.substring(3, 5), 16) * 255.0f; final float g = Integer.parseInt(color.substring(3, 5), 16) / 255.0f;
final float b = Integer.parseInt(color.substring(5, 7), 16) * 255.0f; final float b = Integer.parseInt(color.substring(5, 7), 16) / 255.0f;
return new Color(r, g, b); return new Color(r, g, b);
} }
case 9 -> { case 9 -> {
final float r = Integer.parseInt(color.substring(1, 3), 16) * 255.0f; final float r = Integer.parseInt(color.substring(1, 3), 16) / 255.0f;
final float g = Integer.parseInt(color.substring(3, 5), 16) * 255.0f; final float g = Integer.parseInt(color.substring(3, 5), 16) / 255.0f;
final float b = Integer.parseInt(color.substring(5, 7), 16) * 255.0f; final float b = Integer.parseInt(color.substring(5, 7), 16) / 255.0f;
final float a = Integer.parseInt(color.substring(7, 9), 16) * 255.0f; final float a = Integer.parseInt(color.substring(7, 9), 16) / 255.0f;
return new Color(r, g, b, a); return new Color(r, g, b, a);
} }
default -> throw new Exception("Can not parse color ... '" + colorBase + "'"); default -> throw new Exception("Can not parse color ... '" + colorBase + "'");
@ -531,4 +531,20 @@ public record Color(
return new Color(this.r, this.g, this.b, value); return new Color(this.r, this.g, this.b, value);
} }
public Color withR(final int value) {
return new Color(value / 255.0f, this.g, this.b, this.a);
}
public Color withG(final int value) {
return new Color(this.r, value / 255.0f, this.b, this.a);
}
public Color withB(final int value) {
return new Color(this.r, this.g, value / 255.0f, this.a);
}
public Color withA(final int value) {
return new Color(this.r, this.g, this.b, value / 255.0f);
}
} }