Use Color.foreground / Style.font.family for fallbacks

Five sites hardcoded "#cacccc" or "JetBrainsMono Nerd Font" as the
fallback when no bar context was available. Those magic strings are
the *current* palette defaults — they diverge silently when the theme
changes. Bind to the Color / Style singletons so the fallback tracks
whatever the theme says the foreground / monospace family should be.

Color.qml itself keeps the literal "#cacccc" — that's the seed value
the singleton is bootstrapped with before the theme loads.
This commit is contained in:
David Heinemeier Hansson
2026-05-20 20:29:23 +02:00
parent 73e6127d4e
commit c1fca7cbe4
5 changed files with 10 additions and 9 deletions
+2 -1
View File
@@ -1,4 +1,5 @@
import QtQuick
import qs.Commons
// 1px horizontal divider for panel sections. The alpha-on-foreground tint
// keeps the rule legible against the panel background without competing
@@ -6,7 +7,7 @@ import QtQuick
Rectangle {
id: root
property color foreground: "#cacccc"
property color foreground: Color.foreground
property real strength: 0.12
width: parent ? parent.width : implicitWidth
+2 -2
View File
@@ -11,8 +11,8 @@ Item {
property real step: 0.05
property bool integer: false
property color trackColor: bar ? Style.selectedFillFor(bar.foreground, Color.accent) : "#333"
property color fillColor: bar ? bar.foreground : "#cacccc"
property color knobColor: bar ? bar.foreground : "#cacccc"
property color fillColor: bar ? bar.foreground : Color.foreground
property color knobColor: bar ? bar.foreground : Color.foreground
property bool dragging: false
property real trackHeight: Math.max(4, Math.round(Style.spacing.controlHeight * 0.11))
property real knobSize: Math.max(14, Math.round(Style.spacing.controlHeight * 0.38))
+2 -2
View File
@@ -33,8 +33,8 @@ BarWidget {
anchors.left: parent.left
width: parent.width
text: root.title
color: root.bar ? root.bar.foreground : "#cacccc"
font.family: root.bar ? root.bar.fontFamily : "JetBrainsMono Nerd Font"
color: root.bar ? root.bar.foreground : Color.foreground
font.family: root.bar ? root.bar.fontFamily : Style.font.family
font.pixelSize: Style.font.body
elide: Text.ElideRight
opacity: 0.85
+2 -2
View File
@@ -87,8 +87,8 @@ BarWidget {
property bool active: false
text: glyph
color: active ? (root.bar ? root.bar.foreground : "#cacccc") : Qt.rgba(0.7, 0.7, 0.7, 0.3)
font.family: root.bar ? root.bar.fontFamily : "JetBrainsMono Nerd Font"
color: active ? (root.bar ? root.bar.foreground : Color.foreground) : Qt.rgba(0.7, 0.7, 0.7, 0.3)
font.family: root.bar ? root.bar.fontFamily : Style.font.family
font.pixelSize: Style.font.bodySmall
}
}
+2 -2
View File
@@ -233,8 +233,8 @@ BarWidget {
property string title: ""
property string value: ""
property var history: []
property color barFg: "#cacccc"
property string fontFamily: "JetBrainsMono Nerd Font"
property color barFg: Color.foreground
property string fontFamily: Style.font.family
spacing: Style.space(4)