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

Merge pull request #579 from alebastr/date-fractional-seconds 

fix(clock): lower precision of zoned_time to avoid fractional seconds in output
This commit is contained in:
Alex 2020-02-06 21:27:01 +00:00 committed by GitHub
parent e1215a6d17 e70f8d8730
commit b719569243
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/modules/clock.hpp
View File

@ -14,7 +14,7 @@ namespace waybar::modules {
struct waybar_time { struct waybar_time {
std::locale locale; std::locale locale;
date::zoned_time<std::chrono::system_clock::duration> ztime; date::zoned_seconds ztime;
}; };
class Clock : public ALabel { class Clock : public ALabel {

5
src/modules/clock.cpp
View File

@ -37,8 +37,9 @@ auto waybar::modules::Clock::update() -> void {
// Time zone can change. Be sure to pick that. // Time zone can change. Be sure to pick that.
time_zone_ = date::current_zone(); time_zone_ = date::current_zone();
} }
auto now = std::chrono::system_clock::now(); auto now = std::chrono::system_clock::now();
waybar_time wtime = {locale_, date::make_zoned(time_zone_, now)}; waybar_time wtime = {locale_,
date::make_zoned(time_zone_, date::floor<std::chrono::seconds>(now))};
auto text = fmt::format(format_, wtime); auto text = fmt::format(format_, wtime);
label_.set_markup(text); label_.set_markup(text);