pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
patrick96 2020-11-27 20:46:04 +01:00 committed by Patrick Ziegler
parent 4dfbba11c4
commit 477189e443
3 changed files with 15 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/components/builder.hpp
View File

@ -70,9 +70,6 @@ class builder {
map<attribute, bool> m_attrs{}; map<attribute, bool> m_attrs{};
int m_fontindex{0}; int m_fontindex{0};
string m_background{};
string m_foreground{};
}; };
POLYBAR_NS_END POLYBAR_NS_END

6
src/utils/color.cpp
View File

@ -51,7 +51,6 @@ static string normalize_hex(string hex) {
return hex; return hex;
} }
rgba::rgba() : m_value(0), m_type(NONE) {} rgba::rgba() : m_value(0), m_type(NONE) {}
rgba::rgba(uint32_t value, color_type type) : m_value(value), m_type(type) {} rgba::rgba(uint32_t value, color_type type) : m_value(value), m_type(type) {}
rgba::rgba(string hex) { rgba::rgba(string hex) {
@ -71,9 +70,7 @@ rgba::rgba(string hex) {
rgba::operator string() const { rgba::operator string() const {
char s[10]; char s[10];
size_t len = 0; size_t len = snprintf(s, 10, "#%08x", m_value);
len = snprintf(s, 10, "#%08x", m_value);
return string(s, len); return string(s, len);
} }
@ -98,7 +95,6 @@ rgba::operator uint32_t() const {
return m_value; return m_value;
} }
uint32_t rgba::value() const { uint32_t rgba::value() const {
return this->m_value; return this->m_value;
} }

44
tests/unit_tests/utils/color.cpp
View File

@ -5,38 +5,27 @@
using namespace polybar; using namespace polybar;
TEST(Rgba, constructor) { TEST(Rgba, constructor) {
rgba v{"invalid"}; EXPECT_FALSE(rgba("invalid").has_color());
EXPECT_FALSE(v.has_color());
v = rgba{"#f"}; EXPECT_FALSE(rgba("#f").has_color());
EXPECT_FALSE(v.has_color());
v = rgba{"#12"}; EXPECT_EQ(rgba::ALPHA_ONLY, rgba{"#12"}.type());
EXPECT_EQ(rgba::ALPHA_ONLY, v.type());
v = rgba{"#ff"}; EXPECT_EQ(0xff000000, rgba{"#ff"}.value());
EXPECT_EQ(0xff000000, (uint32_t)v.value());
v = rgba{"#fff"}; EXPECT_EQ(0xffffffff, rgba{"#fff"}.value());
EXPECT_EQ(0xffffffff, v.value());
v = rgba{"#890"}; EXPECT_EQ(0xFF889900, rgba{"#890"}.value());
EXPECT_EQ(0xFF889900, v.value());
v = rgba{"#a890"}; EXPECT_EQ(0xaa889900, rgba{"#a890"}.value());
EXPECT_EQ(0xaa889900, v.value());
v = rgba{"#55888777"}; EXPECT_EQ(0x55888777, rgba{"#55888777"}.value());
EXPECT_EQ(0x55888777, v.value());
v = rgba{"#88aaaaaa"}; EXPECT_EQ(0x88aaaaaa, rgba{"#88aaaaaa"}.value());
EXPECT_EQ(0x88aaaaaa, v.value());
v = rgba{"#00aaaaaa"}; EXPECT_EQ(0x00aaaaaa, rgba{"#00aaaaaa"}.value());
EXPECT_EQ(0x00aaaaaa, v.value());
v = rgba{"#00FFFFFF"}; EXPECT_EQ(0x00FFFFFF, rgba{"#00FFFFFF"}.value());
EXPECT_EQ(0x00FFFFFF, v.value());
} }
TEST(Rgba, parse) { TEST(Rgba, parse) {
@ -55,13 +44,8 @@ TEST(Rgba, parse) {
} }
TEST(Rgba, string) { TEST(Rgba, string) {
rgba v{"#1234"}; EXPECT_EQ("#11223344", static_cast<string>(rgba{"#1234"}));
EXPECT_EQ("#12000000", static_cast<string>(rgba{"#12"}));
EXPECT_EQ("#11223344", static_cast<string>(v));
v = rgba{"#12"};
EXPECT_EQ("#12000000", static_cast<string>(v));
} }
TEST(Rgba, eq) { TEST(Rgba, eq) {
@ -69,7 +53,7 @@ TEST(Rgba, eq) {
EXPECT_TRUE(v == rgba(0, rgba::NONE)); EXPECT_TRUE(v == rgba(0, rgba::NONE));
EXPECT_TRUE(v == rgba(0x11, rgba::NONE)); EXPECT_TRUE(v == rgba(0x11, rgba::NONE));
EXPECT_FALSE(v == rgba{0x1234}); EXPECT_FALSE(v == rgba{0x123456});
v = rgba{0xCC123456}; v = rgba{0xCC123456};