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

Merge pull request #1773 from kj/backlight-format-states

pull/1734/head
Alex 2022-11-07 09:23:17 +01:00 committed by GitHub
parent 1a1c617520 253222d31c
commit ed898cd211
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/modules/backlight.cpp
View File

@ -174,9 +174,20 @@ auto waybar::modules::Backlight::update() -> void {
const uint8_t percent = const uint8_t percent =
best->get_max() == 0 ? 100 : round(best->get_actual() * 100.0f / best->get_max()); best->get_max() == 0 ? 100 : round(best->get_actual() * 100.0f / best->get_max());
label_->set_markup(fmt::format(format_, fmt::arg("percent", std::to_string(percent)),
auto format = format_;
auto state = getState(percent);
if (!state.empty() && config_["format-" + state].isString()) {
format = config_["format-" + state].asString();
}
if (format.empty()) {
event_box_.hide();
} else {
event_box_.show();
label_->set_markup(fmt::format(format, fmt::arg("percent", std::to_string(percent)),
fmt::arg("icon", getIcon(percent)))); fmt::arg("icon", getIcon(percent))));
getState(percent); }
} else { } else {
if (!previous_best_.has_value()) { if (!previous_best_.has_value()) {
return; return;