diff --git a/include/ALabel.hpp b/include/ALabel.hpp index 078e577c..cf2cc286 100644 --- a/include/ALabel.hpp +++ b/include/ALabel.hpp @@ -31,7 +31,7 @@ class ALabel : public IModule { virtual bool handleToggle(GdkEventButton *const &ev); virtual bool handleScroll(GdkEventScroll *); - virtual std::string getState(uint8_t value, bool lesser = false, bool reverse = false); + virtual std::string getState(uint8_t value, bool lesser = false); private: std::vector pid_; diff --git a/src/ALabel.cpp b/src/ALabel.cpp index 6ebbc827..e1fa212d 100644 --- a/src/ALabel.cpp +++ b/src/ALabel.cpp @@ -129,7 +129,7 @@ std::string waybar::ALabel::getIcon(uint16_t percentage, const std::string& alt, return ""; } -std::string waybar::ALabel::getState(uint8_t value, bool lesser, bool reverse) { +std::string waybar::ALabel::getState(uint8_t value, bool lesser) { if (!config_["states"].isObject()) { return ""; } @@ -143,8 +143,8 @@ std::string waybar::ALabel::getState(uint8_t value, bool lesser, bool reverse) { } } // Sort states - std::sort(states.begin(), states.end(), [&reverse](auto& a, auto& b) { - return reverse ? a.second < b.second : a.second > b.second; + std::sort(states.begin(), states.end(), [&lesser](auto& a, auto& b) { + return lesser ? a.second < b.second : a.second > b.second; }); std::string valid_state; for (auto const& state : states) { diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp index 1aaa6489..b51ed496 100644 --- a/src/modules/battery.cpp +++ b/src/modules/battery.cpp @@ -130,7 +130,7 @@ auto waybar::modules::Battery::update() -> void { } std::transform(status.begin(), status.end(), status.begin(), ::tolower); auto format = format_; - auto state = getState(capacity, true, true); + auto state = getState(capacity, true); if (!old_status_.empty()) { label_.get_style_context()->remove_class(old_status_); }