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

style(battery): format

pull/364/head
Alex 2019-05-22 10:09:05 +02:00
parent 2fa581c7ea
commit 14ace24a26
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/battery.cpp
View File

@ -156,8 +156,7 @@ auto waybar::modules::Battery::update() -> void {
if (tooltipEnabled()) { if (tooltipEnabled()) {
std::string tooltip_text; std::string tooltip_text;
if (time_remaining != 0) { if (time_remaining != 0) {
std::string time_to = std::string("Time to ") + std::string time_to = std::string("Time to ") + ((time_remaining > 0) ? "empty" : "full");
((time_remaining > 0) ? "empty" : "full");
tooltip_text = time_to + ": " + formatTimeRemaining(time_remaining); tooltip_text = time_to + ": " + formatTimeRemaining(time_remaining);
} else { } else {
tooltip_text = status; tooltip_text = status;
@ -183,7 +182,9 @@ auto waybar::modules::Battery::update() -> void {
event_box_.hide(); event_box_.hide();
} else { } else {
event_box_.show(); event_box_.show();
label_.set_markup(fmt::format( label_.set_markup(fmt::format(format,
format, fmt::arg("capacity", capacity), fmt::arg("icon", getIcon(capacity, state)), fmt::arg("time", formatTimeRemaining(time_remaining)))); fmt::arg("capacity", capacity),
fmt::arg("icon", getIcon(capacity, state)),
fmt::arg("time", formatTimeRemaining(time_remaining))));
} }
} }