mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

SVG: Added support for RGBA, HSL and HSLA colours

Browse source
This commit is contained in:
ed 2020-04-20 15:28:12 +01:00
parent 6cb75d9d2c
commit 49361b4775
1 changed files with 46 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

67
modules/juce_gui_basics/drawables/juce_SVGParser.cpp
View file

@ -1518,16 +1518,18 @@ private:
if (text.startsWithChar ('#'))
{
uint32 hex[6] = { 0 };
uint32 hex[8] = { 0 };
hex[6] = hex[7] = 15;
int numChars = 0;
auto s = text.getCharPointer();
while (numChars < 6)
while (numChars < 8)
{
auto hexValue = CharacterFunctions::getHexDigitValue (*++s);
if (hexValue >= 0)
hex [numChars++] = (uint32) hexValue;
hex[numChars++] = (uint32) hexValue;
else
break;
}
@ -1539,30 +1541,53 @@ private:
return Colour ((uint8) ((hex[0] << 4) + hex[1]),
(uint8) ((hex[2] << 4) + hex[3]),
(uint8) ((hex[4] << 4) + hex[5]));
(uint8) ((hex[4] << 4) + hex[5]),
(uint8) ((hex[6] << 4) + hex[7]));
}
if (text.startsWith ("rgb"))
if (text.startsWith ("rgb") || text.startsWith ("hsl"))
{
auto openBracket = text.indexOfChar ('(');
auto closeBracket = text.indexOfChar (openBracket, ')');
if (openBracket >= 3 && closeBracket > openBracket)
auto tokens = [&text]
{
StringArray tokens;
tokens.addTokens (text.substring (openBracket + 1, closeBracket), ",", "");
tokens.trim();
tokens.removeEmptyStrings();
auto openBracket = text.indexOfChar ('(');
auto closeBracket = text.indexOfChar (openBracket, ')');
if (tokens[0].containsChar ('%'))
return Colour ((uint8) roundToInt (2.55 * tokens[0].getDoubleValue()),
(uint8) roundToInt (2.55 * tokens[1].getDoubleValue()),
(uint8) roundToInt (2.55 * tokens[2].getDoubleValue()));
StringArray arr;
return Colour ((uint8) tokens[0].getIntValue(),
(uint8) tokens[1].getIntValue(),
(uint8) tokens[2].getIntValue());
}
if (openBracket >= 3 && closeBracket > openBracket)
{
arr.addTokens (text.substring (openBracket + 1, closeBracket), ",", "");
arr.trim();
arr.removeEmptyStrings();
}
return arr;
}();
auto alpha = [&tokens, &text]
{
if ((text.startsWith ("rgba") || text.startsWith ("hsla")) && tokens.size() == 4)
return tokens[3].getFloatValue();
return 1.0f;
}();
if (text.startsWith ("hsl"))
return Colour ((float) (tokens[0].getDoubleValue() / 360.0),
(float) (tokens[1].getDoubleValue() / 100.0),
(float) (tokens[2].getDoubleValue() / 100.0),
alpha);
if (tokens[0].containsChar ('%'))
return Colour ((uint8) roundToInt (2.55 * tokens[0].getDoubleValue()),
(uint8) roundToInt (2.55 * tokens[1].getDoubleValue()),
(uint8) roundToInt (2.55 * tokens[2].getDoubleValue()),
alpha);
return Colour ((uint8) tokens[0].getIntValue(),
(uint8) tokens[1].getIntValue(),
(uint8) tokens[2].getIntValue(),
alpha);
}
if (text == "inherit")