darmanandClaude Opus 5
b16cc93ff6
The shell was running two unrelated palettes: an amber one (#FFD063 accent, #EEEEEE text, #0F1012 panels) hardcoded as ~200 raw hex literals across the launchers, sidebar, systray, vitals and notifications, and an orange one (#e8722a) that only the dense bar had, tokenized as per-file properties. This unifies on the ORANGE values under the AMBER naming scheme, and moves the lot into widgets/theme/Theme.qml. `surface` takes the dense bar's void (#0a0a0a) rather than the old panel background. Zero color and font literals remain anywhere under widgets/ outside Theme.qml. Collisions resolved, all near-duplicates that wanted to be one token: - #0F1012 + #0A0A0C + #0a0a0a -> surface - #EEEEEE + #dedede -> text - #7A7B7D + #858585 -> muted - #292C30 + #22262C -> raised - #FFD063 + #e8722a -> accent Two derived things rather than literals. accentSoft (the pale flash the top/bottom bars show while a launcher is open) was a hand-picked #FFF3C0 against amber, which is simply wrong against orange; it is now Qt.tint(accent, white 55%), a ratio checked against the original (amber tinted 55% gives #FFE9B8 vs the hand-picked #FFF3C0). And the dense bar had been hand-encoding Qt.rgba(0.87,0.87,0.87,a) and Qt.rgba(0.91,0.45,0.16,a), which are just text and accent at alpha -- now textAlpha(a)/accentAlpha(a), so they track a palette change instead of silently drifting. Fonts came along too. Digital-7 Mono is dropped for DepartureMono: it was never packaged, relying on a manual ~/.dots/fonts/digital_7 install that does not exist on terra, so `fc-match "Digital-7 Mono"` resolved to DejaVu Sans and all 38 of those sites -- the launcher lists, sidebar clock, systray labels, every vitals readout -- were silently rendering in a PROPORTIONAL fallback. Numeric columns should visibly improve. readoutFont is an alias of displayFont rather than a second literal so the two roles cannot drift apart. quickshell/CLAUDE.md updated: it said "No shared theme/tokens file yet" and told contributors to grep for the existing hex color, which would now reintroduce exactly what this removes. Verified: no file references Theme. without the import, none imports it unused, and the whole shell -- launchers, sidebar, vitals, systray, notifications, not just the harness -- hot-reloaded clean on terra. tests/HeadlessSmoke.qml deliberately keeps its own copies; its value is having no dependencies. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01SgcWkm3t6BDQktYHQvb8Hx
113 lines
2.7 KiB
QML
113 lines
2.7 KiB
QML
import Quickshell
|
|
import Quickshell.Services.Pipewire
|
|
import Quickshell.Wayland
|
|
import QtQuick
|
|
import qs.widgets.theme
|
|
|
|
Scope {
|
|
id: root
|
|
|
|
readonly property PwNode sink: Pipewire.defaultAudioSink
|
|
readonly property real volume: sink?.audio?.volume ?? 0
|
|
readonly property bool muted: sink?.audio?.muted ?? false
|
|
readonly property real maxVolume: 1.5
|
|
|
|
property bool active: false
|
|
|
|
PwObjectTracker {
|
|
objects: [root.sink]
|
|
}
|
|
|
|
Timer {
|
|
id: hideTimer
|
|
interval: 1500
|
|
onTriggered: root.active = false
|
|
}
|
|
|
|
Connections {
|
|
target: root.sink?.audio
|
|
|
|
function onVolumeChanged() {
|
|
root.active = true;
|
|
hideTimer.restart();
|
|
}
|
|
|
|
function onMutedChanged() {
|
|
root.active = true;
|
|
hideTimer.restart();
|
|
}
|
|
}
|
|
|
|
PanelWindow {
|
|
screen: Quickshell.screens.find(s => s.name === "DP-2")
|
|
visible: root.active
|
|
|
|
WlrLayershell.layer: WlrLayer.Overlay
|
|
exclusionMode: ExclusionMode.Ignore
|
|
|
|
color: "transparent"
|
|
|
|
anchors {
|
|
bottom: true
|
|
left: true
|
|
right: true
|
|
}
|
|
|
|
margins {
|
|
bottom: 30
|
|
left: 12
|
|
right: 12
|
|
}
|
|
|
|
implicitHeight: percentText.implicitHeight + 4 + bar.height
|
|
|
|
Text {
|
|
id: percentText
|
|
|
|
anchors.horizontalCenter: parent.horizontalCenter
|
|
anchors.bottom: bar.top
|
|
anchors.bottomMargin: 4
|
|
|
|
text: Math.round(Math.min(root.volume, root.maxVolume) * 100) + "%"
|
|
color: !root.muted && root.volume > 1 ? Theme.hot : Theme.accent
|
|
font.pointSize: 12
|
|
font.bold: true
|
|
}
|
|
|
|
Item {
|
|
id: bar
|
|
|
|
anchors.bottom: parent.bottom
|
|
width: parent.width
|
|
height: 6
|
|
|
|
Rectangle {
|
|
anchors.centerIn: parent
|
|
implicitHeight: 6
|
|
width: parent.width * Math.min(root.volume, root.maxVolume) / root.maxVolume
|
|
color: Theme.hot
|
|
visible: !root.muted && root.volume > 1
|
|
|
|
Behavior on width {
|
|
NumberAnimation {
|
|
duration: 150
|
|
}
|
|
}
|
|
}
|
|
|
|
Rectangle {
|
|
anchors.centerIn: parent
|
|
implicitHeight: 6
|
|
width: parent.width * Math.min(root.volume, 1) / root.maxVolume
|
|
color: root.muted ? Theme.muted : Theme.accent
|
|
|
|
Behavior on width {
|
|
NumberAnimation {
|
|
duration: 150
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|