mirror/polybar
3
0
Fork 0
mirror of https://github.com/polybar/polybar.git synced 2026-02-09 20:35:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(color_util): Parsing

Browse Source
This commit is contained in:
Michael Carlberg
2017-01-27 13:46:27 +01:00
parent af5f129b76
commit beedc5ab84
5 changed files with 61 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/parser.cpp
View File

@ -77,7 +77,7 @@ void parser::codeblock(string&& data, const bar_settings& bar) {
switch (tag) {
case 'B':
m_sig.emit(change_background{parse_color(value, bar.background)});
m_sig.emit(change_background{parse_color(value, 0)});
break;
case 'F':
@ -181,11 +181,10 @@ size_t parser::text(string&& data) {
* Process color hex string and convert it to the correct value
*/
unsigned int parser::parse_color(const string& s, unsigned int fallback) {
unsigned int color{0};
if (s.empty() || s[0] == '-' || (color = color_util::parse(s, fallback)) == fallback) {
return fallback;
if (!s.empty() && s[0] != '-') {
return color_util::parse(s, fallback);
}
return color_util::premultiply_alpha(color);
return fallback;
}
/**