mirror/polybar
3
0
Fork 0
mirror of https://github.com/polybar/polybar.git synced 2026-02-07 21:25:46 +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

17
include/utils/color.hpp
View File

@ -99,7 +99,7 @@ namespace color_util {
inline string simplify_hex(string hex) {
// convert #ffrrggbb to #rrggbb
if (hex.length() == 9 && hex[1] == 'f' && hex[2] == 'f') {
if (hex.length() == 9 && std::toupper(hex[1]) == 'F' && std::toupper(hex[2]) == 'F') {
hex.erase(1, 2);
}
@ -122,10 +122,19 @@ struct rgb {
// clang-format off
explicit rgb(double r, double g, double b) : r(r), g(g), b(b) {}
explicit rgb(unsigned int color) : rgb(
color_util::red_channel<unsigned char>(color_util::premultiply_alpha(color) / 255.0),
color_util::green_channel<unsigned char>(color_util::premultiply_alpha(color) / 255.0),
color_util::blue_channel<unsigned char>(color_util::premultiply_alpha(color) / 255.0)) {}
color_util::red_channel<unsigned char>(color_util::premultiply_alpha(color)) / 255.0,
color_util::green_channel<unsigned char>(color_util::premultiply_alpha(color)) / 255.0,
color_util::blue_channel<unsigned char>(color_util::premultiply_alpha(color)) / 255.0) {}
// clang-format on
operator unsigned int() {
// clang-format off
return 0xFF << 24
| static_cast<int>(r * 255) << 16
| static_cast<int>(g * 255) << 8
| static_cast<int>(b * 255);
// clang-format on
}
};
struct rgba {