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

Merge pull request #2668 from LukashonakV/cpp20_clock

This commit is contained in:
Alexis Rouillard 2023-11-13 08:34:59 +01:00 committed by GitHub
parent a51dd8fc52 7308893adb
commit 9ac27de7d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/modules/clock.cpp
View File

@ -316,15 +316,17 @@ auto waybar::modules::Clock::get_calendar(const year_month_day& today, const yea
// Week numbers on the left // Week numbers on the left
if (cldWPos_ == WS::LEFT && line > 0) { if (cldWPos_ == WS::LEFT && line > 0) {
if (line > 1) { if (line > 1) {
if (line < ml[(unsigned)ymTmp.month() - 1u]) if (line < ml[(unsigned)ymTmp.month() - 1u]) {
os << fmt_lib::vformat( os << fmt_lib::vformat(
locale_, fmtMap_[4], locale_, fmtMap_[4],
fmt_lib::make_format_args( fmt_lib::make_format_args(
(line == 2) ? zoned_seconds{tz, local_days{ymTmp / 1}} (line == 2)
: zoned_seconds{tz, local_days{cldGetWeekForLine( ? static_cast<const date::zoned_seconds&&>(
ymTmp, firstdow, line)}})) zoned_seconds{tz, local_days{ymTmp / 1}})
: static_cast<const date::zoned_seconds&&>(zoned_seconds{
tz, local_days{cldGetWeekForLine(ymTmp, firstdow, line)}})))
<< ' '; << ' ';
else } else
os << pads; os << pads;
} }
} }
@ -342,9 +344,11 @@ auto waybar::modules::Clock::get_calendar(const year_month_day& today, const yea
<< fmt_lib::vformat( << fmt_lib::vformat(
locale_, fmtMap_[4], locale_, fmtMap_[4],
fmt_lib::make_format_args( fmt_lib::make_format_args(
(line == 2) ? zoned_seconds{tz, local_days{ymTmp / 1}} (line == 2) ? static_cast<const date::zoned_seconds&&>(
: zoned_seconds{tz, local_days{cldGetWeekForLine( zoned_seconds{tz, local_days{ymTmp / 1}})
ymTmp, firstdow, line)}})); : static_cast<const date::zoned_seconds&&>(
zoned_seconds{tz, local_days{cldGetWeekForLine(
ymTmp, firstdow, line)}})));
else else
os << pads; os << pads;
} }
@ -353,7 +357,9 @@ auto waybar::modules::Clock::get_calendar(const year_month_day& today, const yea
} }
// Apply user's formats // Apply user's formats
if (line < 2) if (line < 2)
tmp << fmt_lib::vformat(locale_, fmtMap_[line], fmt_lib::make_format_args(os.str())); tmp << fmt_lib::vformat(
locale_, fmtMap_[line],
fmt_lib::make_format_args(static_cast<const std::string_view&&>(os.str())));
else else
tmp << os.str(); tmp << os.str();
// Clear ostringstream // Clear ostringstream
@ -364,9 +370,12 @@ auto waybar::modules::Clock::get_calendar(const year_month_day& today, const yea
} }
os << std::regex_replace( os << std::regex_replace(
fmt_lib::vformat(locale_, fmtMap_[2], fmt_lib::make_format_args(tmp.str())), fmt_lib::vformat(locale_, fmtMap_[2],
fmt_lib::make_format_args(static_cast<const std::string_view&&>(tmp.str()))),
std::regex("\\{today\\}"), std::regex("\\{today\\}"),
fmt_lib::vformat(locale_, fmtMap_[3], fmt_lib::make_format_args(date::format("{:L%e}", d)))); fmt_lib::vformat(locale_, fmtMap_[3],
fmt_lib::make_format_args(
static_cast<const std::string_view&&>(date::format("{:L%e}", d)))));
if (cldMode_ == CldMode::YEAR) if (cldMode_ == CldMode::YEAR)
cldYearCached_ = os.str(); cldYearCached_ = os.str();