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

removed duplicate code

This commit is contained in:
ArneshRC 2024-01-19 15:11:30 +05:30
parent 74e863ed73
commit dacffdb095
No known key found for this signature in database
GPG Key ID: 92806D9D6C659F84
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/modules/battery.cpp
View File

@ -694,33 +694,35 @@ auto waybar::modules::Battery::update() -> void {
void waybar::modules::Battery::setBarClass(std::string& state) { void waybar::modules::Battery::setBarClass(std::string& state) {
auto classes = bar_.window.get_style_context()->list_classes(); auto classes = bar_.window.get_style_context()->list_classes();
const std::string prefix = "battery-";
auto old_class_it = std::find_if(classes.begin(), classes.end(), auto old_class_it = std::find_if(classes.begin(), classes.end(),
[](auto classname) { [&prefix](auto classname) {
return classname.rfind("battery-", 0) == 0; return classname.rfind(prefix, 0) == 0;
}); });
auto old_class = *old_class_it;
auto new_class = prefix + state;
// If the bar doesn't have any `battery-` class // If the bar doesn't have any `battery-` class
if(old_class_it == classes.end()) { if(old_class_it == classes.end()) {
if(!state.empty()) { if(!state.empty()) {
bar_.window.get_style_context()->add_class("battery-" + state); bar_.window.get_style_context()->add_class(new_class);
} }
return; return;
} }
auto old_class = *old_class_it;
// If the bar has a `battery-` class, // If the bar has a `battery-` class,
// but `state` is empty // but `state` is empty
if(state.empty()) { if(state.empty()) {
bar_.window.get_style_context()->remove_class(old_class); bar_.window.get_style_context()->remove_class(old_class);
return; return;
} }
auto new_class = "battery-" + state;
// If the bar has a `battery-` class, // If the bar has a `battery-` class,
// and `state` is NOT empty // and `state` is NOT empty
if(old_class != new_class) { if(old_class != new_class) {
bar_.window.get_style_context()->remove_class(old_class); bar_.window.get_style_context()->remove_class(old_class);
bar_.window.get_style_context()->add_class("battery-" + state); bar_.window.get_style_context()->add_class(new_class);
} }
} }