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

Merge pull request #3167 from kiriDevs/battery-health-fix 

fix(battery): Fix `{health}` format replacement
master
Alexis Rouillard 2024-04-24 23:16:18 +02:00 committed by GitHub
parent a04016e0b6 a2c5a8215b
commit a597a994d2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/modules/battery.cpp
View File

@ -371,7 +371,12 @@ waybar::modules::Battery::getInfos() {
if (charge_full_exists && charge_full_design_exists) { if (charge_full_exists && charge_full_design_exists) {
float batHealthPercent = ((float)charge_full / charge_full_design) * 100; float batHealthPercent = ((float)charge_full / charge_full_design) * 100;
if (mainBatHealthPercent == 0.0f || batHealthPercent < mainBatHealthPercent) { if (mainBatHealthPercent == 0.0F || batHealthPercent < mainBatHealthPercent) {
mainBatHealthPercent = batHealthPercent;
}
} else if (energy_full_exists && energy_full_design_exists) {
float batHealthPercent = ((float)energy_full / energy_full_design) * 100;
if (mainBatHealthPercent == 0.0F || batHealthPercent < mainBatHealthPercent) {
mainBatHealthPercent = batHealthPercent; mainBatHealthPercent = batHealthPercent;
} }
} }
@ -711,10 +716,10 @@ auto waybar::modules::Battery::update() -> void {
} else { } else {
event_box_.show(); event_box_.show();
auto icons = std::vector<std::string>{status + "-" + state, status, state}; auto icons = std::vector<std::string>{status + "-" + state, status, state};
label_.set_markup( label_.set_markup(fmt::format(
fmt::format(fmt::runtime(format), fmt::arg("capacity", capacity), fmt::arg("power", power), fmt::runtime(format), fmt::arg("capacity", capacity), fmt::arg("power", power),
fmt::arg("icon", getIcon(capacity, icons)), fmt::arg("icon", getIcon(capacity, icons)), fmt::arg("time", time_remaining_formatted),
fmt::arg("time", time_remaining_formatted), fmt::arg("cycles", cycles))); fmt::arg("cycles", cycles), fmt::arg("health", fmt::format("{:.3}", health))));
} }
// Call parent update // Call parent update
ALabel::update(); ALabel::update();