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

Fix style and spelling

This commit is contained in:
Sergey Mishin 2021-10-05 09:55:30 +00:00
parent 110c66dd32
commit d8bc6c92bb
No known key found for this signature in database
GPG Key ID: BFFA09D74430117B
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/modules/clock.cpp
View File

@ -31,7 +31,7 @@ waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
); );
} }
// If we parse all timezones and no one is good, add nullptr to the tmezones vector, to mark that we need to show localtime // If all timezones are parsed and no one is good, add nullptr to the timezones vector, to mark that local time should be shown.
if (!time_zones_.size()) { if (!time_zones_.size()) {
time_zones_.push_back(nullptr); time_zones_.push_back(nullptr);
} }
@ -47,14 +47,14 @@ waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
spdlog::warn("As using a timezone, some format args may be missing as the date library haven't got a release since 2018."); spdlog::warn("As using a timezone, some format args may be missing as the date library haven't got a release since 2018.");
} }
// Check if we have to particular placeholder in tooltip format, to know what to calculate on update // Check if a particular placeholder is present in the tooltip format, to know what to calculate on update.
if (config_["tooltip-format"].isString()) { if (config_["tooltip-format"].isString()) {
std::string trimmedFormat = config_["tooltip-format"].asString(); std::string trimmed_format = config_["tooltip-format"].asString();
trimmedFormat.erase(std::remove_if(trimmedFormat.begin(), trimmed_format.erase(std::remove_if(trimmed_format.begin(),
trimmedFormat.end(), trimmed_format.end(),
[](unsigned char x){return std::isspace(x);}), [](unsigned char x){return std::isspace(x);}),
trimmedFormat.end()); trimmed_format.end());
if (trimmedFormat.find("{" + kCalendarPlaceholder + "}") != std::string::npos) { if (trimmed_format.find("{" + kCalendarPlaceholder + "}") != std::string::npos) {
is_calendar_in_tooltip_ = true; is_calendar_in_tooltip_ = true;
} }
} }
@ -100,12 +100,12 @@ auto waybar::modules::Clock::update() -> void {
if (tooltipEnabled()) { if (tooltipEnabled()) {
if (config_["tooltip-format"].isString()) { if (config_["tooltip-format"].isString()) {
std::string calendarText = ""; std::string calendar_lines = "";
if (is_calendar_in_tooltip_) { if (is_calendar_in_tooltip_) {
calendarText = calendar_text(wtime); calendar_lines = calendar_text(wtime);
} }
auto tooltip_format = config_["tooltip-format"].asString(); auto tooltip_format = config_["tooltip-format"].asString();
text = fmt::format(tooltip_format, wtime, fmt::arg("calendar", calendarText)); text = fmt::format(tooltip_format, wtime, fmt::arg("calendar", calendar_lines));
} }
} }