From 017ec486d84dbd0089f0b4a40b66e6b9dfb64646 Mon Sep 17 00:00:00 2001 From: Lemmy Date: Sun, 10 May 2026 22:21:52 -0400 Subject: [PATCH] fix(bar): capsule_foreground was not always respected --- src/shell/bar/widget.cpp | 2 +- src/shell/bar/widget.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/shell/bar/widget.cpp b/src/shell/bar/widget.cpp index 4118a8a00..d540adb7b 100644 --- a/src/shell/bar/widget.cpp +++ b/src/shell/bar/widget.cpp @@ -17,7 +17,7 @@ ColorSpec Widget::widgetForegroundOr(const ColorSpec& fallback) const noexcept { return *m_widgetForeground; } const auto& spec = m_barCapsuleSpec; - if (spec.enabled && spec.foreground.has_value() && shouldShowBarCapsule()) { + if (spec.enabled && spec.foreground.has_value()) { return *spec.foreground; } return fallback; diff --git a/src/shell/bar/widget.h b/src/shell/bar/widget.h index 1c834256a..a6b80ad78 100644 --- a/src/shell/bar/widget.h +++ b/src/shell/bar/widget.h @@ -73,8 +73,8 @@ public: // Whether the bar should paint the decorative capsule for this frame (spec enabled + visible ink). [[nodiscard]] virtual bool shouldShowBarCapsule() const; - // Resolved icon + primary label color: `[widget.*] color` when set, else `capsule_foreground` when the capsule is - // visible, else `fallback` (e.g. colorSpecFromRole(OnSurface)). + // Resolved icon + primary label color: `[widget.*] color` when set, else `capsule_foreground` when capsule styling is + // enabled, else `fallback` (e.g. colorSpecFromRole(OnSurface)). [[nodiscard]] ColorSpec widgetForegroundOr(const ColorSpec& fallback) const noexcept; protected: