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

Merge pull request #190 from Robinhuett/fix_backlight_fmtalt 

fix(backlight) Allow format-alt
pull/191/head
Alex 2019-02-25 10:52:42 +01:00 committed by GitHub
parent 5a7f801922 63e97df9ff
commit abfa428dab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/modules/backlight.hpp
View File

@ -61,5 +61,6 @@ private:
std::vector<BacklightDev> devices_; std::vector<BacklightDev> devices_;
std::optional<BacklightDev> previous_best_; std::optional<BacklightDev> previous_best_;
std::string previous_format_;
}; };
} // namespace waybar::modules } // namespace waybar::modules

18
src/modules/backlight.cpp
View File

@ -99,7 +99,7 @@ void waybar::modules::Backlight::BacklightDev::set_max(int max) { max_ = max; }
waybar::modules::Backlight::Backlight(const std::string &name, waybar::modules::Backlight::Backlight(const std::string &name,
const Json::Value &config) const Json::Value &config)
: ALabel(config, "{}", 2), name_(name), : ALabel(config, "{percent}%", 2), name_(name),
preferred_device_( preferred_device_(
config["device"].isString() ? config["device"].asString() : "") { config["device"].isString() ? config["device"].asString() : "") {
label_.set_name("backlight"); label_.set_name("backlight");
@ -187,24 +187,17 @@ auto waybar::modules::Backlight::update() -> void {
devices = devices_; devices = devices_;
} }
std::string markup_fmt;
if (config_["format"].isString()) {
markup_fmt = config_["format"].asString();
}
if (markup_fmt.empty()) {
markup_fmt = "{percent}%";
}
const auto best = const auto best =
best_device(devices.cbegin(), devices.cend(), preferred_device_); best_device(devices.cbegin(), devices.cend(), preferred_device_);
if (best != nullptr) { if (best != nullptr) {
if (previous_best_.has_value() && previous_best_.value() == *best) { if (previous_best_.has_value() && previous_best_.value() == *best &&
!previous_format_.empty() && previous_format_ == format_) {
return; return;
} }
const auto percent = const auto percent =
best->get_max() == 0 ? 100 : best->get_actual() * 100 / best->get_max(); best->get_max() == 0 ? 100 : best->get_actual() * 100 / best->get_max();
label_.set_markup(fmt::format(markup_fmt, label_.set_markup(fmt::format(format_,
fmt::arg("percent", std::to_string(percent)), fmt::arg("percent", std::to_string(percent)),
fmt::arg("icon", getIcon(percent)))); fmt::arg("icon", getIcon(percent))));
} else { } else {
@ -214,6 +207,7 @@ auto waybar::modules::Backlight::update() -> void {
label_.set_markup(""); label_.set_markup("");
} }
previous_best_ = best == nullptr ? std::nullopt : std::optional{*best}; previous_best_ = best == nullptr ? std::nullopt : std::optional{*best};
previous_format_ = format_;
} }
template <class ForwardIt> template <class ForwardIt>