From 151cf545320cce6b49215e9d59c0e01f05d103be Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 5 Oct 2025 09:58:34 +0200 Subject: [PATCH] fix: lint --- src/modules/clock.cpp | 12 +++++++----- src/modules/custom.cpp | 2 +- src/modules/image.cpp | 11 ++++++----- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp index 2329f97f..62706944 100644 --- a/src/modules/clock.cpp +++ b/src/modules/clock.cpp @@ -30,7 +30,9 @@ waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config) cldMonShift_{year(1900) / January}, tzInTooltip_{m_tlpFmt_.find("{" + kTZPlaceholder + "}") != std::string::npos}, tzCurrIdx_{0}, - tzTooltipFormat_{config_["timezone-tooltip-format"].isString() ? config_["timezone-tooltip-format"].asString() : ""}, + tzTooltipFormat_{config_["timezone-tooltip-format"].isString() + ? config_["timezone-tooltip-format"].asString() + : ""}, ordInTooltip_{m_tlpFmt_.find("{" + kOrdPlaceholder + "}") != std::string::npos} { m_tlpText_ = m_tlpFmt_; @@ -200,19 +202,19 @@ auto waybar::modules::Clock::getTZtext(sys_seconds now) -> std::string { for (size_t tz_idx{0}; tz_idx < tzList_.size(); ++tz_idx) { // Skip local timezone (nullptr) - never show it in tooltip if (tzList_[tz_idx] == nullptr) continue; - + // Skip current timezone unless timezone-tooltip-format is specified if (static_cast(tz_idx) == tzCurrIdx_ && tzTooltipFormat_.empty()) continue; - + const auto* tz = tzList_[tz_idx]; auto zt{zoned_time{tz, now}}; - + // Add newline before each entry except the first if (!first) { os << '\n'; } first = false; - + // Use timezone-tooltip-format if specified, otherwise use format_ const std::string& fmt = tzTooltipFormat_.empty() ? format_ : tzTooltipFormat_; os << fmt_lib::vformat(m_locale_, fmt, fmt_lib::make_format_args(zt)); diff --git a/src/modules/custom.cpp b/src/modules/custom.cpp index 2fbc9a16..d75633e9 100644 --- a/src/modules/custom.cpp +++ b/src/modules/custom.cpp @@ -92,7 +92,7 @@ void waybar::modules::Custom::continuousWorker() { if (config_["restart-interval"].isNumeric()) { pid_ = -1; thread_.sleep_for(std::chrono::milliseconds( - std::max(1L, // Minimum 1ms due to millisecond precision + std::max(1L, // Minimum 1ms due to millisecond precision static_cast(config_["restart-interval"].asDouble() * 1000)))); fp_ = util::command::open(cmd, pid_, output_name_); if (!fp_) { diff --git a/src/modules/image.cpp b/src/modules/image.cpp index 9529ee35..173aabd3 100644 --- a/src/modules/image.cpp +++ b/src/modules/image.cpp @@ -15,11 +15,12 @@ waybar::modules::Image::Image(const std::string& id, const Json::Value& config) size_ = config["size"].asInt(); interval_ = config_["interval"] == "once" - ? std::chrono::milliseconds::max() - : std::chrono::milliseconds( - std::max(1L, // Minimum 1ms due to millisecond precision - static_cast( - (config_["interval"].isNumeric() ? config_["interval"].asDouble() : 0) * 1000))); + ? std::chrono::milliseconds::max() + : std::chrono::milliseconds(std::max( + 1L, // Minimum 1ms due to millisecond precision + static_cast( + (config_["interval"].isNumeric() ? config_["interval"].asDouble() : 0) * + 1000))); if (size_ == 0) { size_ = 16;