e89da58940
It was not quite clear how try_apply_alpha should behave if the given color was not ALPHA_ONLY. The implementation just returned 'this'. However, the build relied on it returning the given color. This broke all bg and fg settings in the entire bar. To clear this up, we switch this around take the alpha channel of 'this' and also return 'this' if it isn't ALPHA_ONLY. Fixes #2255
67 lines
1.6 KiB
C++
67 lines
1.6 KiB
C++
#pragma once
|
|
|
|
#include <cstdlib>
|
|
|
|
#include "common.hpp"
|
|
|
|
POLYBAR_NS
|
|
|
|
/**
|
|
* Represents immutable 32-bit color values.
|
|
*/
|
|
class rgba {
|
|
public:
|
|
enum color_type { NONE, ARGB, ALPHA_ONLY };
|
|
|
|
explicit rgba();
|
|
explicit rgba(uint32_t value, color_type type = ARGB);
|
|
explicit rgba(string hex);
|
|
|
|
operator string() const;
|
|
operator uint32_t() const;
|
|
bool operator==(const rgba& other) const;
|
|
|
|
uint32_t value() const;
|
|
color_type type() const;
|
|
|
|
double alpha_d() const;
|
|
double red_d() const;
|
|
double green_d() const;
|
|
double blue_d() const;
|
|
|
|
uint8_t alpha_i() const;
|
|
uint8_t red_i() const;
|
|
uint8_t green_i() const;
|
|
uint8_t blue_i() const;
|
|
|
|
bool has_color() const;
|
|
rgba apply_alpha_to(rgba other) const;
|
|
rgba try_apply_alpha_to(rgba other) const;
|
|
|
|
private:
|
|
/**
|
|
* Color value in the form ARGB or A000 depending on the type
|
|
*
|
|
* Cannot be const because we have to assign to it in the constructor and initializer lists are not possible.
|
|
*/
|
|
uint32_t m_value;
|
|
|
|
/**
|
|
* NONE marks this instance as invalid. If such a color is encountered, it
|
|
* should be treated as if no color was set.
|
|
*
|
|
* ALPHA_ONLY is used for color strings that only have an alpha channel (#AA)
|
|
* these kinds should be combined with another color that has RGB channels
|
|
* before they are used to render anything.
|
|
*
|
|
* Cannot be const because we have to assign to it in the constructor and initializer lists are not possible.
|
|
*/
|
|
color_type m_type{NONE};
|
|
};
|
|
|
|
namespace color_util {
|
|
string simplify_hex(string hex);
|
|
} // namespace color_util
|
|
|
|
POLYBAR_NS_END
|