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

fix typo and initialize old_status_

pull/76/head
Lucas L. Treffenstädt 2018-11-02 22:08:55 +01:00
parent 0522577fe5
commit 123ce083b4
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/modules/battery.hpp
View File

@ -29,7 +29,7 @@ class Battery : public ALabel {
util::SleeperThread threadTimer_; util::SleeperThread threadTimer_;
std::vector<fs::path> batteries_; std::vector<fs::path> batteries_;
int fd_; int fd_;
std::string old_state_; std::string old_status_;
}; };
} }

7
src/modules/battery.cpp
View File

@ -34,6 +34,7 @@ waybar::modules::Battery::Battery(const Json::Value& config)
for (auto const& bat : batteries_) { for (auto const& bat : batteries_) {
inotify_add_watch(fd_, (bat / "uevent").c_str(), IN_ACCESS); inotify_add_watch(fd_, (bat / "uevent").c_str(), IN_ACCESS);
} }
old_status_ = "";
worker(); worker();
} }
@ -85,7 +86,7 @@ std::tuple<uint16_t, std::string> waybar::modules::Battery::getInfos()
} }
} }
std::string waybar::modules::Battery::getState(uint16_t capacity, bool charging) std::string waybar::modules::Battery::getState(uint16_t capacity)
{ {
// Get current state // Get current state
std::vector<std::pair<std::string, uint16_t>> states; std::vector<std::pair<std::string, uint16_t>> states;
@ -102,7 +103,7 @@ std::string waybar::modules::Battery::getState(uint16_t capacity, bool charging)
}); });
std::string validState = ""; std::string validState = "";
for (auto state : states) { for (auto state : states) {
if (capacity <= state.second && !charging && validState.empty()) { if (capacity <= state.second && validState.empty()) {
label_.get_style_context()->add_class(state.first); label_.get_style_context()->add_class(state.first);
validState = state.first; validState = state.first;
} else { } else {
@ -118,7 +119,7 @@ auto waybar::modules::Battery::update() -> void
label_.set_tooltip_text(status); label_.set_tooltip_text(status);
std::transform(status.begin(), status.end(), status.begin(), ::tolower); std::transform(status.begin(), status.end(), status.begin(), ::tolower);
auto format = format_; auto format = format_;
auto state = getState(capacity, charging); auto state = getState(capacity);
label_.get_style_context()->remove_class(old_status_); label_.get_style_context()->remove_class(old_status_);
label_.get_style_context()->add_class(status); label_.get_style_context()->add_class(status);
old_status_ = status; old_status_ = status;