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
264 lines
8.6 KiB
QML
264 lines
8.6 KiB
QML
pragma ComponentBehavior: Bound
|
|
|
|
import Quickshell
|
|
import Quickshell.Hyprland
|
|
import Quickshell.Wayland
|
|
import Quickshell.Widgets
|
|
import QtQuick
|
|
import QtQuick.Layouts
|
|
import qs.widgets.theme
|
|
|
|
// Variant 3 — "Spotlight": top-center command bar with a compact result list.
|
|
Scope {
|
|
id: root
|
|
|
|
property bool active: false
|
|
|
|
function toggle() {
|
|
root.active = !root.active;
|
|
}
|
|
|
|
GlobalShortcut {
|
|
name: "launcher3"
|
|
description: "Toggle app launcher (Spotlight)"
|
|
onPressed: root.toggle()
|
|
}
|
|
|
|
PanelWindow {
|
|
id: win
|
|
|
|
visible: root.active
|
|
|
|
WlrLayershell.layer: WlrLayer.Overlay
|
|
WlrLayershell.keyboardFocus: WlrKeyboardFocus.Exclusive
|
|
|
|
// Ignore other panels' exclusive zones so the full-screen dim
|
|
// backdrop below isn't shrunk away from the bar strips.
|
|
exclusionMode: ExclusionMode.Ignore
|
|
|
|
color: "transparent"
|
|
|
|
anchors {
|
|
top: true
|
|
left: true
|
|
right: true
|
|
bottom: true
|
|
}
|
|
|
|
readonly property int maxRows: 7
|
|
|
|
property int sel: 0
|
|
onSelChanged: list.positionViewAtIndex(sel, ListView.Contain)
|
|
|
|
onVisibleChanged: {
|
|
if (visible) {
|
|
input.text = "";
|
|
sel = 0;
|
|
input.forceActiveFocus();
|
|
}
|
|
}
|
|
|
|
function move(delta) {
|
|
const n = model.apps.length;
|
|
if (n === 0)
|
|
return;
|
|
sel = (sel + delta + n) % n;
|
|
}
|
|
|
|
function run() {
|
|
if (model.launch(sel))
|
|
root.active = false;
|
|
}
|
|
|
|
AppModel {
|
|
id: model
|
|
search: input.text
|
|
}
|
|
|
|
// Dim backdrop — click to dismiss.
|
|
MouseArea {
|
|
anchors.fill: parent
|
|
onClicked: root.active = false
|
|
}
|
|
|
|
ColumnLayout {
|
|
anchors.top: parent.top
|
|
anchors.horizontalCenter: parent.horizontalCenter
|
|
anchors.topMargin: Math.round(parent.height * 0.16)
|
|
width: 640
|
|
spacing: 0
|
|
|
|
// Command line
|
|
Rectangle {
|
|
Layout.fillWidth: true
|
|
implicitHeight: 60
|
|
color: Theme.surface
|
|
border.width: 1
|
|
border.color: Theme.accent
|
|
|
|
RowLayout {
|
|
anchors.fill: parent
|
|
anchors.leftMargin: 18
|
|
anchors.rightMargin: 18
|
|
spacing: 14
|
|
|
|
Text {
|
|
text: ">"
|
|
color: Theme.accent
|
|
font.family: Theme.readoutFont
|
|
font.pointSize: 26
|
|
font.bold: true
|
|
}
|
|
|
|
Item {
|
|
Layout.fillWidth: true
|
|
implicitHeight: 34
|
|
|
|
TextInput {
|
|
id: input
|
|
anchors.fill: parent
|
|
verticalAlignment: TextInput.AlignVCenter
|
|
|
|
color: Theme.text
|
|
font.pointSize: 17
|
|
clip: true
|
|
|
|
Keys.onPressed: event => {
|
|
switch (event.key) {
|
|
case Qt.Key_Down:
|
|
case Qt.Key_Tab:
|
|
win.move(1);
|
|
event.accepted = true;
|
|
break;
|
|
case Qt.Key_Up:
|
|
case Qt.Key_Backtab:
|
|
win.move(-1);
|
|
event.accepted = true;
|
|
break;
|
|
case Qt.Key_Return:
|
|
case Qt.Key_Enter:
|
|
win.run();
|
|
event.accepted = true;
|
|
break;
|
|
case Qt.Key_Escape:
|
|
root.active = false;
|
|
event.accepted = true;
|
|
break;
|
|
}
|
|
}
|
|
|
|
onTextChanged: win.sel = 0
|
|
|
|
Text {
|
|
anchors.fill: parent
|
|
verticalAlignment: Text.AlignVCenter
|
|
visible: input.text.length === 0
|
|
text: "run application"
|
|
color: Theme.muted
|
|
font: input.font
|
|
}
|
|
}
|
|
}
|
|
|
|
Text {
|
|
text: model.apps.length + " ▸"
|
|
color: Theme.muted
|
|
font.family: Theme.readoutFont
|
|
font.pointSize: 16
|
|
}
|
|
}
|
|
}
|
|
|
|
// Accent seam between the command line and results.
|
|
Rectangle {
|
|
Layout.fillWidth: true
|
|
implicitHeight: 3
|
|
color: Theme.accent
|
|
visible: model.apps.length > 0
|
|
}
|
|
|
|
// Results
|
|
Rectangle {
|
|
Layout.fillWidth: true
|
|
// Cap the visible height to maxRows; scroll beyond that.
|
|
implicitHeight: Math.min(model.apps.length, win.maxRows) * 44 + 2
|
|
color: Theme.surface
|
|
opacity: 0.97
|
|
visible: model.apps.length > 0
|
|
border.width: 1
|
|
border.color: Theme.raised
|
|
|
|
ListView {
|
|
id: list
|
|
anchors.fill: parent
|
|
anchors.margins: 1
|
|
|
|
clip: true
|
|
model: model.apps
|
|
currentIndex: win.sel
|
|
interactive: contentHeight > height
|
|
boundsBehavior: Flickable.StopAtBounds
|
|
|
|
delegate: MouseArea {
|
|
id: entry
|
|
required property int index
|
|
required property var modelData
|
|
|
|
width: ListView.view.width
|
|
implicitHeight: 44
|
|
hoverEnabled: true
|
|
cursorShape: Qt.PointingHandCursor
|
|
|
|
onEntered: win.sel = index
|
|
onClicked: win.run()
|
|
|
|
readonly property bool selected: index === win.sel
|
|
|
|
Rectangle {
|
|
anchors.fill: parent
|
|
color: entry.selected ? Theme.selection : "transparent"
|
|
|
|
Rectangle {
|
|
anchors.left: parent.left
|
|
anchors.top: parent.top
|
|
anchors.bottom: parent.bottom
|
|
width: 3
|
|
color: Theme.accent
|
|
visible: entry.selected
|
|
}
|
|
|
|
RowLayout {
|
|
anchors.fill: parent
|
|
anchors.leftMargin: 16
|
|
anchors.rightMargin: 16
|
|
spacing: 12
|
|
|
|
IconImage {
|
|
implicitSize: 24
|
|
source: Quickshell.iconPath(entry.modelData.icon, "application-x-executable")
|
|
}
|
|
|
|
Text {
|
|
text: entry.modelData.name
|
|
color: entry.selected ? Theme.accent : Theme.text
|
|
font.pointSize: 12
|
|
elide: Text.ElideRight
|
|
Layout.fillWidth: true
|
|
}
|
|
|
|
Text {
|
|
text: entry.modelData.genericName || ""
|
|
color: Theme.muted
|
|
font.pointSize: 10
|
|
elide: Text.ElideRight
|
|
Layout.maximumWidth: 200
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|