blankie
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor: avoid useless has_class check

This commit is contained in:
Alexis 2018-08-10 17:05:12 +02:00
parent 9e85c68fc8
commit 4d3879f26f
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/battery.cpp
View File

@ -37,7 +37,7 @@ auto waybar::modules::Battery::update() -> void
charging = true; charging = true;
} }
} }
if (charging == true) { if (charging) {
_label.get_style_context()->add_class("charging"); _label.get_style_context()->add_class("charging");
} else { } else {
_label.get_style_context()->remove_class("charging"); _label.get_style_context()->remove_class("charging");

7
src/modules/custom.cpp
View File

@ -4,7 +4,6 @@
waybar::modules::Custom::Custom(std::string name, Json::Value config) waybar::modules::Custom::Custom(std::string name, Json::Value config)
: _name(name), _config(config) : _name(name), _config(config)
{ {
_label.get_style_context()->add_class("custom-" + name);
if (!_config["exec"]) { if (!_config["exec"]) {
std::cerr << name + " has no exec path." << std::endl; std::cerr << name + " has no exec path." << std::endl;
return; return;
@ -36,9 +35,11 @@ auto waybar::modules::Custom::update() -> void
} }
// Hide label if output is empty // Hide label if output is empty
if (output.empty()) if (output.empty()) {
_label.get_style_context()->remove_class("custom-" + _name);
_label.hide(); _label.hide();
else { } else {
_label.get_style_context()->add_class("custom-" + _name);
auto format = _config["format"] ? _config["format"].asString() : "{}"; auto format = _config["format"] ? _config["format"].asString() : "{}";
_label.set_text(fmt::format(format, output)); _label.set_text(fmt::format(format, output));
_label.show(); _label.show();

5
src/modules/pulseaudio.cpp
View File

@ -103,9 +103,8 @@ auto waybar::modules::Pulseaudio::update() -> void
if (_muted) { if (_muted) {
format = format =
_config["format-muted"] ? _config["format-muted"].asString() : format; _config["format-muted"] ? _config["format-muted"].asString() : format;
if (!_label.get_style_context()->has_class("muted")) _label.get_style_context()->add_class("muted");
_label.get_style_context()->add_class("muted"); } else
} else if (_label.get_style_context()->has_class("muted"))
_label.get_style_context()->remove_class("muted"); _label.get_style_context()->remove_class("muted");
_label.set_label(fmt::format(format, _volume)); _label.set_label(fmt::format(format, _volume));
_label.set_tooltip_text(_desc); _label.set_tooltip_text(_desc);

4
src/modules/workspaces.cpp
View File

@ -42,9 +42,9 @@ auto waybar::modules::Workspaces::update() -> void
} else { } else {
auto styleContext = it->second.get_style_context(); auto styleContext = it->second.get_style_context();
bool isCurrent = node["focused"].asBool(); bool isCurrent = node["focused"].asBool();
if (styleContext->has_class("current") && !isCurrent) { if (!isCurrent) {
styleContext->remove_class("current"); styleContext->remove_class("current");
} else if (!styleContext->has_class("current") && isCurrent) { } else if (isCurrent) {
styleContext->add_class("current"); styleContext->add_class("current");
} }
if (hided) { if (hided) {