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

Merge pull request #1412 from eigenbrot/battery_zero_pad_minutes 

Add battery format-time option for zero-padded minutes
This commit is contained in:
Alex 2022-09-07 16:54:28 +02:00 committed by GitHub
parent 03ca8de6d7 6b83360e76
commit e58f1fd3e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
man/waybar-battery.5.scd
View File

@ -114,9 +114,10 @@ The *battery* module displays the current capacity and state (eg. charging) of y
The *battery* module allows you to define how time should be formatted via *format-time*. The *battery* module allows you to define how time should be formatted via *format-time*.
The two arguments are: The three arguments are:
*{H}*: Hours *{H}*: Hours
*{M}*: Minutes *{M}*: Minutes
*{m}*: Zero-padded minutes
# CUSTOM FORMATS # CUSTOM FORMATS

3
src/modules/battery.cpp
View File

@ -308,7 +308,8 @@ const std::string waybar::modules::Battery::formatTimeRemaining(float hoursRemai
if (config_["format-time"].isString()) { if (config_["format-time"].isString()) {
format = config_["format-time"].asString(); format = config_["format-time"].asString();
} }
return fmt::format(format, fmt::arg("H", full_hours), fmt::arg("M", minutes)); std::string zero_pad_minutes = fmt::format("{:02d}", minutes);
return fmt::format(format, fmt::arg("H", full_hours), fmt::arg("M", minutes), fmt::arg("m", zero_pad_minutes));
} }
auto waybar::modules::Battery::update() -> void { auto waybar::modules::Battery::update() -> void {