forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rounding error fixed

This commit is contained in:
bagomot 2023-04-22 11:03:52 +03:00
parent d43f5e55f3
commit efdcb42507
No known key found for this signature in database
GPG Key ID: F28BBD3A259717A8
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/dlangui/graphics/colors.d
View File

@ -354,7 +354,7 @@ uint decodeHexColor(string s, uint defValue = 0) pure {
auto alpha = to!float(ap[0 .. $ - 1].strip);
if(alpha < 0 || alpha > 100)
return defValue;
a = (cast(uint)(alpha * 2.55 + 0.5)).min(255);
a = cast(uint)((alpha * 255.0 / 100.0) + 0.5);
}
else { //rgba(r,g,b,a)
auto alpha = to!float(parts[3].strip);
@ -397,11 +397,15 @@ unittest
static assert(decodeHexColor("#80ff0000") == 0x80ff0000);
static assert(decodeHexColor("rgba(255, 0, 0,.5 )") == 0x80ff0000);
static assert(decodeHexColor("rgba(255,0, 0, 50%)") == 0x80ff0000);
static assert(decodeHexColor("rgba(255,0, 0, 100%)") == 0xffff0000);
static assert(decodeHexColor("rgba(255,0, 0, 0%)") == 0xff0000);
static assert(decodeHexColor("rgb(255,255, 255)") == 0xffffff);
static assert(decodeHexColor("rgb(321,321,321)") == 0); // invalid input
static assert(decodeHexColor("not_valid_color_name") == 0); // invalid input
static assert(decodeHexColor("#80ff00000") == 0); // invalid input
static assert(decodeHexColor("#f0") == 0); // invalid input
static assert(decodeHexColor("rgba(255,255, 255, 10)") == 0); // invalid input
static assert(decodeHexColor("rgba(255,0, 0, 150%)") == 0); // invalid input, return def value
static assert(decodeHexColor("rgba(255,0, 0, -34%)") == 0); // invalid input, return def value
static assert(decodeHexColor("rgb(321,321,321)") == 0); // invalid input, return def value
static assert(decodeHexColor("not_valid_color_name") == 0); // invalid input, return def value
static assert(decodeHexColor("#80ff00000") == 0); // invalid input, return def value
static assert(decodeHexColor("#f0") == 0); // invalid input, return def value
static assert(decodeHexColor("rgba(255,255, 255, 10)") == 0); // invalid input, return def value
}