diff --git a/Common/Data/Text/Parsers.cpp b/Common/Data/Text/Parsers.cpp index 51b6e61372..fe0eaf6c5d 100644 --- a/Common/Data/Text/Parsers.cpp +++ b/Common/Data/Text/Parsers.cpp @@ -63,7 +63,7 @@ bool ParseMacAddress(std::string str, uint8_t macAddr[6]) { return true; } -static bool ParseUnsigned32(const std::string &str, uint32_t *const output) { +static bool TryParseUnsigned32(const std::string &str, uint32_t *const output) { char *endptr = NULL; // Holy crap this is ugly. @@ -95,11 +95,11 @@ static bool ParseUnsigned32(const std::string &str, uint32_t *const output) { bool TryParse(const std::string &str, uint32_t *const output) { if (str[0] != '#') { - return ParseUnsigned32(str, output); + return TryParseUnsigned32(str, output); } else { // Parse it as "#RGBA" and convert to a ABGR interger std::string s = ReplaceAll(str, "#", "0x"); - if (ParseUnsigned32(s, output)) { + if (TryParseUnsigned32(s, output)) { int a = (*output >> 24) & 0xff; int b = (*output >> 16) & 0xff; int g = (*output >> 8) & 0xff; diff --git a/assets/themes/defaultthemes.ini b/assets/themes/defaultthemes.ini index afd9443a44..98d7fe4e0e 100644 --- a/assets/themes/defaultthemes.ini +++ b/assets/themes/defaultthemes.ini @@ -17,6 +17,6 @@ PopupStyleBg = \#303030FF BackgroundColor = \#244D75FF UIAtlas = ../ui_atlas -# Colors are either in the format \#RGB or 0xABGR (e.g. green is \#00FF00FF or 0xFF00FF00) +# Colors are either in the format \#RGBA or 0xABGR (e.g. green is \#00FF00FF or 0xFF00FF00) # Atlas should be in the format path/to/filename where both filename.zim and filename.meta are # Unprovided entry will use the default value \ No newline at end of file