ZacharyZhang-NY/omarchycn
3
4
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 5 Wiki Activity

More tokens

Browse Source
This commit is contained in:
Ryan Hughes
2026-05-19 16:55:56 -04:00
parent 97d4e908af
commit 201a003537
12 changed files with 136 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shell/plugins/app-launcher/AppLauncher.qml
+2 -1
View File
@@ -32,6 +32,7 @@ Item {
property color background: Color.appLauncher.background
property color foreground: Color.appLauncher.text
property color border: Color.appLauncher.border
property color scrim: Color.appLauncher.scrim
property color selectedBackground: Color.appLauncher.selectedBackground
property color selectedText: Color.appLauncher.selectedText
property color selectedBorder: Color.appLauncher.selectedBorder
@@ -336,7 +337,7 @@ Item {
Rectangle {
anchors.fill: parent
color: root.withAlpha(root.background, 0.5)
color: root.scrim
}
MouseArea {
shell/plugins/clipboard-picker/ClipboardPicker.qml
+14 -8
View File
@@ -16,10 +16,16 @@ Item {
property string historyPath: Quickshell.env("HOME") + "/.local/state/omarchy/clipboard-history.json"
property string captureScript: root.omarchyPath + "/shell/scripts/clipboard-capture.sh"
property color accent: Color.menu.selected
// Shares the [menu] surface tokens — themes that style the menu also
// style the clipboard picker. Selected-row colors composed in the
// singleton so consumers drop them straight into Rectangle bindings.
property color background: Color.menu.background
property color foreground: Color.menu.text
property color border: foreground
property color border: Color.menu.border
property color scrim: Color.menu.scrim
property color selectedBackground: Color.menu.selectedBackground
property color selectedText: Color.menu.selectedText
property color selectedBorder: Color.menu.selectedBorder
readonly property int cornerRadius: Style.cornerRadius
property string fontFamily: Quickshell.env("OMARCHY_MENU_FONT") || "monospace"
property int contentMargin: Style.spacing.panelPadding
@@ -254,7 +260,7 @@ Item {
Rectangle {
anchors.fill: parent
color: root.withAlpha(root.background, 0.5)
color: root.scrim
}
MouseArea {
@@ -365,9 +371,9 @@ Item {
width: ListView.view.width
height: root.rowHeight
radius: root.cornerRadius
color: hasCursor ? Style.hoverFillFor(root.foreground, root.accent) : "transparent"
border.color: hasCursor ? Style.hoverBorderFor(root.foreground, root.accent) : "transparent"
border.width: hasCursor ? Style.hoverBorderWidth : 0
color: hasCursor ? root.selectedBackground : "transparent"
border.color: hasCursor ? root.selectedBorder : "transparent"
border.width: (hasCursor && root.selectedBorder.a > 0) ? Style.hoverBorderWidth : 0
Row {
anchors.fill: parent
@@ -391,7 +397,7 @@ Item {
width: parent.width - (parent.parent.entryType === "image" ? parent.height + parent.spacing : 0)
height: parent.height
text: parent.parent.previewText
color: parent.parent.hasCursor ? Style.hoverStateColor(root.foreground, root.accent) : root.foreground
color: parent.parent.hasCursor ? root.selectedText : root.foreground
font.family: root.fontFamily
font.pixelSize: Style.font.title
font.italic: parent.parent.entryType === "image"
@@ -462,7 +468,7 @@ Item {
Text {
text: "󰅌"
color: root.accent
color: root.selectedText
opacity: 0.8
font.family: root.fontFamily
font.pixelSize: Style.font.displayLarge
shell/plugins/emoji-picker/EmojiPicker.qml
+13 -7
View File
@@ -18,10 +18,16 @@ Item {
property var emojis: []
property var filteredEmojis: []
property color accent: Color.menu.selected
// Shares the [menu] surface tokens — themes that style the menu also
// style the emoji picker. Selected-cell colors composed in the
// singleton so consumers drop them straight into Rectangle bindings.
property color background: Color.menu.background
property color foreground: Color.menu.text
property color border: foreground
property color border: Color.menu.border
property color scrim: Color.menu.scrim
property color selectedBackground: Color.menu.selectedBackground
property color selectedText: Color.menu.selectedText
property color selectedBorder: Color.menu.selectedBorder
readonly property int cornerRadius: Style.cornerRadius
property string fontFamily: Quickshell.env("OMARCHY_MENU_FONT") || "monospace"
property int contentMargin: Style.spacing.panelPadding
@@ -178,7 +184,7 @@ Item {
Rectangle {
anchors.fill: parent
color: root.withAlpha(root.background, 0.5)
color: root.scrim
}
MouseArea {
@@ -288,9 +294,9 @@ Item {
width: root.cellWidth
height: root.cellHeight
radius: root.cornerRadius
color: hasCursor ? Style.hoverFillFor(root.foreground, root.accent) : "transparent"
border.color: hasCursor ? Style.hoverBorderFor(root.foreground, root.accent) : "transparent"
border.width: hasCursor ? Style.hoverBorderWidth : 0
color: hasCursor ? root.selectedBackground : "transparent"
border.color: hasCursor ? root.selectedBorder : "transparent"
border.width: (hasCursor && root.selectedBorder.a > 0) ? Style.hoverBorderWidth : 0
Text {
text: parent.emoji
@@ -326,7 +332,7 @@ Item {
Text {
text: "󰈉"
color: root.accent
color: root.selectedText
opacity: 0.8
font.family: root.fontFamily
font.pixelSize: Style.font.displayLarge
shell/plugins/image-picker/ImagePicker.qml
+2 -1
View File
@@ -31,6 +31,7 @@ Item {
// Bound to the central [image-picker] section in shell.toml via Color.qml.
property color background: Color.imagePicker.background
property color foreground: Color.imagePicker.text
property color scrim: Color.imagePicker.scrim
property color selectedBorder: Color.imagePicker.selectedBorder
property color unselectedBorder: Color.imagePicker.unselectedBorder
property int expandedWidth: 768
@@ -440,7 +441,7 @@ Item {
Rectangle {
anchors.fill: parent
visible: root.opened && root.imagesLoaded
color: root.background
color: root.scrim
}
MouseArea {
shell/plugins/lock/LockView.qml
+6 -6
View File
@@ -87,8 +87,8 @@ Item {
width: root.fieldWidth
height: root.fieldHeight
anchors.centerIn: parent
color: root.withAlpha(Color.background, 0.8)
border.color: root.failureMessage.length > 0 ? Color.urgent : (root.authenticatingPassword ? Color.accent : Color.foreground)
color: Color.lock.background
border.color: root.failureMessage.length > 0 ? Color.lock.borderError : (root.authenticatingPassword ? Color.lock.borderActive : Color.lock.border)
border.width: root.outlineThickness
radius: Style.cornerRadius
clip: true
@@ -107,9 +107,9 @@ Item {
echoMode: TextInput.Password
passwordCharacter: "\u2022"
passwordMaskDelay: 0
color: Color.foreground
selectionColor: root.withAlpha(Color.accent, 0.45)
selectedTextColor: Color.foreground
color: Color.lock.text
selectionColor: Color.lock.selection
selectedTextColor: Color.lock.text
font.family: "monospace"
font.pixelSize: root.fieldFontSize
cursorVisible: activeFocus && !root.authenticatingPassword && root.hasTyped
@@ -139,7 +139,7 @@ Item {
anchors.fill: passwordInput
text: root.failureMessage.length > 0 ? root.failureMessage : root.placeholderText
visible: passwordInput.text.length === 0
color: root.failureMessage.length > 0 ? Color.urgent : Color.foreground
color: root.failureMessage.length > 0 ? Color.lock.textError : Color.lock.text
font.family: "monospace"
font.pixelSize: root.fieldFontSize
font.italic: root.failureMessage.length > 0
shell/plugins/menu/Menu.qml
+3 -2
View File
@@ -68,6 +68,7 @@ Item {
property color background: Color.menu.background
property color foreground: Color.menu.text
property color border: Color.menu.border
property color scrim: Color.menu.scrim
property color selectedBackground: Color.menu.selectedBackground
property color selectedText: Color.menu.selectedText
property color selectedBorder: Color.menu.selectedBorder
@@ -942,7 +943,7 @@ Item {
Rectangle {
anchors.fill: parent
color: root.withAlpha(root.background, 0.5)
color: root.scrim
}
MouseArea {
@@ -1194,7 +1195,7 @@ Item {
Text {
text: "󰈉"
color: root.selectedBackground
color: root.selectedText
opacity: 0.8
font.family: root.fontFamily
font.pixelSize: Style.font.displayLarge
shell/plugins/polkit/PolkitAgent.qml
+14 -11
View File
@@ -9,10 +9,13 @@ Item {
id: root
property string fontFamily: Quickshell.env("OMARCHY_MENU_FONT") || "monospace"
property color accent: Color.accent
property color background: Color.menu.background
property color foreground: Color.menu.text
property color border: foreground
// Bound to the central [polkit] section in shell.toml via Color.qml.
property color accent: Color.polkit.accent
property color background: Color.polkit.background
property color foreground: Color.polkit.text
property color border: Color.polkit.border
property color borderError: Color.polkit.borderError
property color scrim: Color.polkit.scrim
readonly property int cornerRadius: Style.cornerRadius
property int contentMargin: Style.spacing.panelPadding
property int fieldHeight: Math.max(Style.space(42), Style.spacing.controlHeight)
@@ -212,7 +215,7 @@ Item {
Rectangle {
anchors.fill: parent
color: root.withAlpha(root.background, 0.5)
color: root.scrim
}
MouseArea {
@@ -228,7 +231,7 @@ Item {
anchors.centerIn: parent
anchors.horizontalCenterOffset: root.shakeOffset
color: root.background
border.color: root.accent
border.color: root.errorFlash ? root.borderError : root.border
border.width: Math.max(1, Style.space(2))
MouseArea { anchors.fill: parent; onClicked: root.refocus() }
@@ -258,7 +261,7 @@ Item {
Text {
text: "\uf023"
color: root.errorFlash ? Color.urgent : root.accent
color: root.errorFlash ? Color.polkit.textError : root.accent
font.family: root.fontFamily
font.pixelSize: Style.font.iconLarge
width: Style.space(26)
@@ -277,13 +280,13 @@ Item {
verticalAlignment: TextInput.AlignVCenter
activeFocusOnPress: true
clip: true
selectionColor: root.withAlpha(root.accent, 0.45)
selectionColor: Color.alpha(root.accent, 0.45)
selectedTextColor: root.foreground
font.family: root.fontFamily
font.pixelSize: Style.font.iconLarge
echoMode: root.responseVisible ? TextInput.Normal : TextInput.Password
passwordCharacter: "\u2022"
color: root.errorFlash ? Color.urgent : root.foreground
color: root.errorFlash ? Color.polkit.textError : root.foreground
cursorVisible: activeFocus && !root.submitted && !root.errorFlash
readOnly: root.submitted || root.errorFlash
enabled: root.dialogVisible && !root.fingerprintWaiting
@@ -302,7 +305,7 @@ Item {
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
text: root.errorFlash ? "Wrong" : (root.submitted ? "Checking..." : "Enter password")
color: root.errorFlash ? Color.urgent : root.foreground
color: root.errorFlash ? Color.polkit.textError : root.foreground
opacity: root.errorFlash ? 1 : 0.36
font.family: root.fontFamily
font.pixelSize: Style.font.iconLarge
@@ -315,7 +318,7 @@ Item {
height: Style.space(24)
anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter
color: root.errorFlash ? Color.urgent : root.foreground
color: root.errorFlash ? Color.polkit.textError : root.foreground
visible: passwordInput.visible && passwordInput.activeFocus && passwordInput.text.length === 0 && !root.submitted && !root.errorFlash
}
shell/plugins/settings/SettingsPanel.qml
+2 -2
View File
@@ -41,8 +41,8 @@ Item {
// ---------------- theme --------------------------------------------------
// Bar settings deliberately isn't a themable surface in shell.toml — it
// tracks the foundational palette so every theme renders consistently.
property color foreground: Color.foreground
property color background: Color.background
property color foreground: Color.popups.text
property color background: Color.popups.background
property color accent: Color.accent
property color urgent: Color.urgent
property string fontFamily: "monospace"
shell/plugins/settings/components/NDropdown.qml
+2 -2
View File
@@ -11,8 +11,8 @@ Item {
property string label: ""
property string value: ""
property var options: []
property color foreground: Color.foreground
property color background: Color.background
property color foreground: Color.popups.text
property color background: Color.popups.background
property color accent: Color.accent
property string fontFamily: Style.font.family
property int cornerRadius: 0