From 3c7ac11714ae044ff3354ce5b988166795a43d0a Mon Sep 17 00:00:00 2001 From: Henrik Klee Date: Fri, 20 Nov 2026 01:29:19 +0800 Subject: [PATCH 01/32] Control center: pages, starting with Display MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A module's page is its panel's own content inside the control center, pushed in from the right while the main view moves left; the card's height follows the push. ← in the header or Esc goes back, a second Esc closes, Home closes from anywhere. The control center has its own instance of each panel it hosts, not the bar's: pageHost stands in for the bar the panel reads its colours, font and commands from. Hosted, a panel (Ui/Panel.qml) shows its page where it would open its popup, takes Esc as "back", and leaves its IPC target to the bar's panel; the popup itself is the same content component, so the bar keeps working unchanged. Display is the first page: brightness, auto-brightness, text size and scale. Rotation lock and Stay Awake stay off it there, since the main view has them as toggles. A long press on the brightness slider (or Enter on it) opens it, as does `omarchy-shell omarchy.controlcenter page omarchy.monitor`. The other modules still open the bar's panel. Assisted-by: LLM --- desktop/shell/shell/Ui/Panel.qml | 16 +- .../shell/controlcenter/ControlCenter.qml | 157 +++++++++++++++++- .../shell/plugins/panels/monitor/Panel.qml | 12 +- 3 files changed, 172 insertions(+), 13 deletions(-) diff --git a/desktop/shell/shell/Ui/Panel.qml b/desktop/shell/shell/Ui/Panel.qml index c630ac56..9092987a 100644 --- a/desktop/shell/shell/Ui/Panel.qml +++ b/desktop/shell/shell/Ui/Panel.qml @@ -19,11 +19,19 @@ Item { property bool popoutSwitching: false property bool popoutSwitchClosing: false - readonly property bool opened: panelController.open + // Orchard: a host (the control center) can show this panel's content as + // one of its pages instead of the popup. Hosted, opening shows the page, + // closing (Esc in the content) goes back, the popup stays closed and the + // IPC target is the bar's panel's alone. + property var host: null + property bool hostShown: false + readonly property bool hosted: host !== null + readonly property bool opened: hosted ? hostShown : panelController.open + readonly property bool popupOpen: !hosted && panelController.open readonly property color barForeground: bar ? bar.barForeground : Commons.Color.foreground - function open() { panelController.show() } - function close() { panelController.hide() } + function open() { if (hosted) host.showPage(root); else panelController.show() } + function close() { if (hosted) host.leavePage(root); else panelController.hide() } function closeForPopoutSwitch() { popoutSwitchClosing = true close() @@ -48,7 +56,7 @@ Item { ShellIpc { // A panel that answers its target itself leaves this one without one. - target: root.manageIpc ? root.ipcTarget : "" + target: root.manageIpc && !root.hosted ? root.ipcTarget : "" function open(): void { root.open() } function close(): void { root.close() } diff --git a/desktop/shell/shell/controlcenter/ControlCenter.qml b/desktop/shell/shell/controlcenter/ControlCenter.qml index bc8e7f28..a2ec83f0 100644 --- a/desktop/shell/shell/controlcenter/ControlCenter.qml +++ b/desktop/shell/shell/controlcenter/ControlCenter.qml @@ -12,6 +12,7 @@ import "../plugins/panels/bluetooth" as BluetoothStatus import "../plugins/panels/power" as Power import "../plugins/panels/bluetooth/Model.js" as BluetoothModel import "../plugins/status" as StatusParts +import "../plugins/panels/monitor" as Monitor // The control center (SHELL-SPEC, step 2): the main view. States you flip // and the two sliders, over the same status objects the bar and the lock @@ -88,12 +89,94 @@ Item { function run(argv) { Quickshell.execDetached(argv) } function omarchy(name) { return (Quickshell.env("OMARCHY_PATH") || "/usr/share/omarchy") + "/bin/" + name } - // Until the pages exist: the bar's panel for that module. + // A module's page: its panel's content, pushed in from the right. A + // module without a page yet opens the bar's panel for it. function openPage(module) { + var panelForPage = root.modules[module] + if (panelForPage) { panelForPage.open(); return } root.close() run(["omarchy-shell", "shell", "toggle", module]) } + // ------------------------------------------------------------ pages + // Each page is a panel of its own (not the bar's), hosted: pageHost stands + // in for the bar it would read its colours and font from, and opening or + // closing it shows or leaves the page. + + QtObject { + id: pageHost + readonly property color foreground: root.text + readonly property color barForeground: root.text + readonly property color urgent: Commons.Color.urgent + readonly property string fontFamily: Style.font.family + readonly property var shell: root.shell + readonly property string position: "top" + readonly property bool vertical: false + readonly property int barSize: Style.bar.sizeHorizontal + // The rest of what a panel's own bar button and popup ask of a bar, + // inert here: hosted, neither is ever shown. + readonly property var activePopout: null + readonly property bool foregroundAnimationEnabled: false + readonly property int sizeHorizontal: Style.bar.sizeHorizontal + readonly property int iconFont: Style.font.icon + readonly property int iconSize: Style.font.icon + readonly property int iconSlot: Style.space(28) + readonly property bool iconCanvas: false + readonly property var clickTargets: [] + function barSizeFor() { return Style.bar.sizeHorizontal } + function showTooltip() {} + function hideTooltip() {} + function requestPopout() { return false } + function releasePopout() {} + function notePopoutCard() {} + function popoutCardFor() { return null } + function targetBelongsToWindow() { return false } + function run(command) { Quickshell.execDetached(["sh", "-c", command]) } + function switchPanelFrom(panel, direction) { return false } + function showPage(panel) { root.showPage(panel) } + function leavePage(panel) { root.leavePage(panel) } + } + + Item { + visible: false + Monitor.Panel { id: displayModule; host: pageHost; bar: pageHost; moduleName: "omarchy.monitor" } + } + readonly property var modules: ({ "omarchy.monitor": displayModule }) + readonly property var pageTitles: ({ "omarchy.monitor": Commons.I18n.t("monitor.display") }) + + property var page: null + // 0 on the main view, 1 on the page; the push in between. + property real pageShift: 0 + NumberAnimation { + id: pageSlide + target: root + property: "pageShift" + duration: Style.duration(300) + easing.type: Easing.OutCubic + onFinished: if (root.pageShift === 0) root.dropPage() + } + + function showPage(panelForPage) { + if (!root.opened) root.open() + if (root.page && root.page !== panelForPage) root.page.hostShown = false + root.page = panelForPage + panelForPage.hostShown = true + pageSlide.to = 1 + pageSlide.restart() + Qt.callLater(function() { if (pageLoader.item) pageLoader.item.forceActiveFocus() }) + } + function leavePage(panelForPage) { + if (root.page !== panelForPage) return + pageSlide.to = 0 + pageSlide.restart() + keyCatcher.forceActiveFocus() + } + function dropPage() { + if (root.page) root.page.hostShown = false + root.page = null + root.pageShift = 0 + } + function toggleWifi() { Networking.wifiEnabled = !Networking.wifiEnabled } function toggleBluetooth() { if (bluetooth.adapter) bluetooth.adapter.enabled = !bluetooth.adapter.enabled } function toggleMic() { @@ -299,7 +382,7 @@ Item { root.reveal = root.springTarget root.springVelocity = 0 running = false - if (!root.opened) root.mapped = false + if (!root.opened) { root.mapped = false; root.dropPage() } } } } @@ -316,6 +399,8 @@ Item { function toggle(): void { root.toggle() } function open(): void { if (!root.opened) root.open() } function close(): void { root.close() } + // Open at a module's page: omarchy.monitor, omarchy.network, … + function page(module: string): void { root.openPage(module) } } // ------------------------------------------------------------- window @@ -354,7 +439,7 @@ Item { Keys.onPressed: function(event) { var cell = root.focusedCell() switch (event.key) { - case Qt.Key_Escape: root.close(); break + case Qt.Key_Escape: if (root.page) root.leavePage(root.page); else root.close(); break case Qt.Key_Tab: root.stepFocus(1); break case Qt.Key_Backtab: root.stepFocus(-1); break case Qt.Key_Up: root.moveFocus(0, -1); break @@ -430,7 +515,11 @@ Item { x: root.phone ? 0 : parent.width - width - Style.gapsOut y: root.phone ? root.barInset : root.barInset + Style.gapsOut width: root.phone ? parent.width : root.cardWidth - height: root.phone ? parent.height - root.barInset : content.implicitHeight + root.pad * 2 + // The main view's height, the page's, and the push between them. + readonly property real mainHeight: content.implicitHeight + root.pad * 2 + readonly property real pageHeight: pageView.implicitHeight + root.pad * 2 + height: root.phone ? parent.height - root.barInset : mainHeight + (pageHeight - mainHeight) * root.pageShift + clip: true color: root.phone ? "transparent" : Commons.Color.popups.background // The bar's popups' own border (KeyboardPanel): the theme's spec. borderSpec: root.phone ? Border.none() @@ -461,7 +550,8 @@ Item { Column { id: content - x: root.pad + x: root.pad - root.pageShift * card.width + visible: root.pageShift < 1 y: root.pad + (root.phone ? Style.space(12) : 0) width: parent.width - root.pad * 2 spacing: root.gap @@ -560,14 +650,65 @@ Item { } Item { - visible: root.phone - x: root.pad + visible: root.phone && root.pageShift < 1 + x: root.pad - root.pageShift * card.width width: parent.width - root.pad * 2 height: root.touchMin anchors.bottom: parent.bottom anchors.bottomMargin: Style.space(24) FooterParts { anchors.fill: parent } } + + // The page: a header with the way back, then the panel's content. + Column { + id: pageView + visible: root.page !== null + x: root.pad + (1 - root.pageShift) * card.width + y: root.pad + (root.phone ? Style.space(12) : 0) + width: parent.width - root.pad * 2 + spacing: root.gap + + Item { + width: parent.width + height: root.touchMin + Row { + anchors.verticalCenter: parent.verticalCenter + spacing: Style.space(8) + Text { + anchors.verticalCenter: parent.verticalCenter + text: "󰁍" + color: root.text + font.family: Style.font.family + font.pixelSize: Style.font.title + } + Text { + anchors.verticalCenter: parent.verticalCenter + textFormat: Text.PlainText + text: root.page ? (root.pageTitles[root.page.moduleName] || "") : "" + color: root.text + font.family: Style.font.family + font.pixelSize: Style.font.title + font.bold: true + } + } + MouseArea { + width: Math.max(root.touchMin, parent.width / 2) + height: parent.height + onClicked: if (root.page) root.leavePage(root.page) + } + } + + Loader { + id: pageLoader + width: parent.width + active: root.page !== null + sourceComponent: root.page ? root.page.pageContent : null + // As tall as its content, within the screen; the content scrolls + // beyond that. + readonly property real room: root.screenHeight - card.y - root.pad * 2 - root.touchMin - root.gap - Style.gapsOut + height: item ? Math.min(item.implicitHeight, root.phone ? card.height - root.pad * 2 - root.touchMin - root.gap - Style.space(12) : room) : 0 + } + } } } @@ -745,6 +886,8 @@ Item { property bool pageArrow: false signal moved(real value) signal longPressed() + // Left and right move it; Enter opens its page. + onActivated: slider.longPressed() function adjust(delta) { if (slider.available) slider.moved(Math.max(0, Math.min(1, slider.value + delta))) } color: Style.controlFill(false, false, root.text, Commons.Color.accent) clip: true diff --git a/desktop/shell/shell/plugins/panels/monitor/Panel.qml b/desktop/shell/shell/plugins/panels/monitor/Panel.qml index c960c910..77c51a00 100644 --- a/desktop/shell/shell/plugins/panels/monitor/Panel.qml +++ b/desktop/shell/shell/plugins/panels/monitor/Panel.qml @@ -391,7 +391,7 @@ Panel { } ShellIpc { - target: "omarchy.monitor" + target: root.hosted ? "" : "omarchy.monitor" function brightness(percent: string): string { return root.brightnessIpc(percent) } function state(): string { return root.stateIpc() } @@ -888,12 +888,15 @@ Panel { } } + // The content, for a host that shows it as a page (the control center). + readonly property Component pageContent: panel.content + KeyboardPanel { id: panel anchorItem: button owner: root bar: root.bar - open: root.opened + open: root.popupOpen focusTarget: panel.loadedContent contentWidth: panel.fittedContentWidth(Style.space(380)) contentHeight: panel.fittedContentHeight(panel.loadedContentHeight, Style.space(860)) @@ -1140,11 +1143,15 @@ Panel { } // ---------- Orchard: rotation lock and Stay Awake ---------- + // Not on the control center's page: there they are toggles of + // their own on the main view. PanelSeparator { + visible: !root.hosted foreground: root.bar.foreground } Toggle { + visible: !root.hosted width: parent.width label: "Rotation lock" description: root.rotationLocked ? "Keep the current orientation" : "Turn the display with the iPad" @@ -1159,6 +1166,7 @@ Panel { } Toggle { + visible: !root.hosted width: parent.width label: Commons.I18n.t("bar.stayAwake") description: root.stayAwake ? "The screen stays on; no automatic lock or sleep" From 827ee9c81f3d5ad02949d0d42a4d0b087444246a Mon Sep 17 00:00:00 2001 From: Henrik Klee Date: Fri, 20 Nov 2026 01:56:49 +0800 Subject: [PATCH 02/32] Control center: a module's icon opens its page on its own One click to where you want, as a desktop menu bar does it: a panel the control center has a page for opens that page instead of its popup, from its bar icon, a shortcut, IPC or the menu alike (Ui/Panel.qml routes it). Opened that way the page stands alone, with no way back to the main view: Esc or a tap outside closes, and the icon again toggles it. Pushed from the main view it keeps its back header. Upstream's module keys join: Super+Ctrl+A, B, D, N and P for Audio, Bluetooth, Display, Network and Power, with a migration for existing users. Display opens in the control center now; the others still open their popups until their pages come. Assisted-by: LLM --- desktop/shell/labwc-rc.xml | 17 ++++++++++ desktop/shell/migrations/1795110922.sh | 12 +++++++ desktop/shell/shell/Ui/Panel.qml | 13 +++++++- .../shell/controlcenter/ControlCenter.qml | 33 ++++++++++++++++--- 4 files changed, 70 insertions(+), 5 deletions(-) create mode 100644 desktop/shell/migrations/1795110922.sh diff --git a/desktop/shell/labwc-rc.xml b/desktop/shell/labwc-rc.xml index 2885019a..d74b06cf 100644 --- a/desktop/shell/labwc-rc.xml +++ b/desktop/shell/labwc-rc.xml @@ -88,6 +88,23 @@ + + + + + + + + + + + + + + + + diff --git a/desktop/shell/migrations/1795110922.sh b/desktop/shell/migrations/1795110922.sh new file mode 100644 index 00000000..dbd0f4a0 --- /dev/null +++ b/desktop/shell/migrations/1795110922.sh @@ -0,0 +1,12 @@ +echo "Super+Ctrl+A, B, D, N and P open Audio, Bluetooth, Display, Network and Power" + +# Upstream's module keys. A new user's rc.xml has them; an existing one gets +# each one it lacks before the launcher's (Super+Space). +rc="$HOME/.config/labwc/rc.xml" +[[ -f $rc ]] && grep -q '^ ' "$rc" || exit 0 +for pair in a:omarchy.audio b:omarchy.bluetooth d:omarchy.monitor n:omarchy.network p:omarchy.power; do + key=${pair%%:*} module=${pair#*:} + grep -q "key=\"W-C-$key\"" "$rc" && continue + sed "0,/^ /s## \n \n \n #" "$rc" > "$rc.new" + mv -- "$rc.new" "$rc" +done diff --git a/desktop/shell/shell/Ui/Panel.qml b/desktop/shell/shell/Ui/Panel.qml index 9092987a..bd6ff565 100644 --- a/desktop/shell/shell/Ui/Panel.qml +++ b/desktop/shell/shell/Ui/Panel.qml @@ -30,7 +30,18 @@ Item { readonly property bool popupOpen: !hosted && panelController.open readonly property color barForeground: bar ? bar.barForeground : Commons.Color.foreground - function open() { if (hosted) host.showPage(root); else panelController.show() } + // Orchard: a panel the control center has a page for opens there instead + // of its popup, from its bar icon, a shortcut, IPC or the menu alike. + function controlCenterFor() { + var center = bar && bar.shell ? bar.shell.controlCenter : null + return center && typeof center.hasPage === "function" && center.hasPage(moduleName) ? center : null + } + function open() { + if (hosted) { host.showPage(root); return } + var center = controlCenterFor() + if (center) center.showModule(moduleName) + else panelController.show() + } function close() { if (hosted) host.leavePage(root); else panelController.hide() } function closeForPopoutSwitch() { popoutSwitchClosing = true diff --git a/desktop/shell/shell/controlcenter/ControlCenter.qml b/desktop/shell/shell/controlcenter/ControlCenter.qml index a2ec83f0..8e33851b 100644 --- a/desktop/shell/shell/controlcenter/ControlCenter.qml +++ b/desktop/shell/shell/controlcenter/ControlCenter.qml @@ -145,6 +145,9 @@ Item { readonly property var pageTitles: ({ "omarchy.monitor": Commons.I18n.t("monitor.display") }) property var page: null + // A page opened on its own (its bar icon, a shortcut): no way back to the + // main view, as the icon's own menu would be; Esc or a tap outside closes. + property bool standalone: false // 0 on the main view, 1 on the page; the push in between. property real pageShift: 0 NumberAnimation { @@ -156,7 +159,25 @@ Item { onFinished: if (root.pageShift === 0) root.dropPage() } + function hasPage(module) { return !!root.modules[module] } + + // Straight to a module's page, as its icon's menu: again closes. + function showModule(module) { + var panelForPage = root.modules[module] + if (!panelForPage) return + if (root.opened && root.standalone && root.page === panelForPage) { root.close(); return } + pageSlide.stop() + if (root.page && root.page !== panelForPage) root.page.hostShown = false + root.page = panelForPage + panelForPage.hostShown = true + root.standalone = true + root.pageShift = 1 + if (!root.opened) root.open() + Qt.callLater(function() { if (pageLoader.item) pageLoader.item.forceActiveFocus() }) + } + function showPage(panelForPage) { + root.standalone = false if (!root.opened) root.open() if (root.page && root.page !== panelForPage) root.page.hostShown = false root.page = panelForPage @@ -167,6 +188,7 @@ Item { } function leavePage(panelForPage) { if (root.page !== panelForPage) return + if (root.standalone) { root.close(); return } pageSlide.to = 0 pageSlide.restart() keyCatcher.forceActiveFocus() @@ -174,6 +196,7 @@ Item { function dropPage() { if (root.page) root.page.hostShown = false root.page = null + root.standalone = false root.pageShift = 0 } @@ -399,8 +422,8 @@ Item { function toggle(): void { root.toggle() } function open(): void { if (!root.opened) root.open() } function close(): void { root.close() } - // Open at a module's page: omarchy.monitor, omarchy.network, … - function page(module: string): void { root.openPage(module) } + // A module's page on its own, as its bar icon opens it: omarchy.monitor, … + function page(module: string): void { root.showModule(module) } } // ------------------------------------------------------------- window @@ -669,6 +692,7 @@ Item { spacing: root.gap Item { + visible: !root.standalone width: parent.width height: root.touchMin Row { @@ -705,8 +729,9 @@ Item { sourceComponent: root.page ? root.page.pageContent : null // As tall as its content, within the screen; the content scrolls // beyond that. - readonly property real room: root.screenHeight - card.y - root.pad * 2 - root.touchMin - root.gap - Style.gapsOut - height: item ? Math.min(item.implicitHeight, root.phone ? card.height - root.pad * 2 - root.touchMin - root.gap - Style.space(12) : room) : 0 + readonly property real header: root.standalone ? 0 : root.touchMin + root.gap + readonly property real room: root.screenHeight - card.y - root.pad * 2 - header - Style.gapsOut + height: item ? Math.min(item.implicitHeight, root.phone ? card.height - root.pad * 2 - header - Style.space(12) : room) : 0 } } } From 91adbdf53213be5f1675f00a725f0ea1b7d43ff9 Mon Sep 17 00:00:00 2001 From: Henrik Klee Date: Fri, 20 Nov 2026 01:58:24 +0800 Subject: [PATCH 03/32] Control center: the bar's icons stay Omarchy's The control center extends Omarchy rather than changing it: the bar's icons, upstream's Super+Ctrl module keys, IPC and the menu open each panel's own popup exactly as upstream does. Only the control center itself slides down, and its pages push in with their back header. Super+Ctrl+A, B, D, N and P stay: upstream's keys for those popups. Assisted-by: LLM --- desktop/shell/labwc-rc.xml | 3 +- desktop/shell/shell/Ui/Panel.qml | 13 +------- .../shell/controlcenter/ControlCenter.qml | 30 ++----------------- 3 files changed, 5 insertions(+), 41 deletions(-) diff --git a/desktop/shell/labwc-rc.xml b/desktop/shell/labwc-rc.xml index d74b06cf..316c0592 100644 --- a/desktop/shell/labwc-rc.xml +++ b/desktop/shell/labwc-rc.xml @@ -88,8 +88,7 @@ - + diff --git a/desktop/shell/shell/Ui/Panel.qml b/desktop/shell/shell/Ui/Panel.qml index bd6ff565..9092987a 100644 --- a/desktop/shell/shell/Ui/Panel.qml +++ b/desktop/shell/shell/Ui/Panel.qml @@ -30,18 +30,7 @@ Item { readonly property bool popupOpen: !hosted && panelController.open readonly property color barForeground: bar ? bar.barForeground : Commons.Color.foreground - // Orchard: a panel the control center has a page for opens there instead - // of its popup, from its bar icon, a shortcut, IPC or the menu alike. - function controlCenterFor() { - var center = bar && bar.shell ? bar.shell.controlCenter : null - return center && typeof center.hasPage === "function" && center.hasPage(moduleName) ? center : null - } - function open() { - if (hosted) { host.showPage(root); return } - var center = controlCenterFor() - if (center) center.showModule(moduleName) - else panelController.show() - } + function open() { if (hosted) host.showPage(root); else panelController.show() } function close() { if (hosted) host.leavePage(root); else panelController.hide() } function closeForPopoutSwitch() { popoutSwitchClosing = true diff --git a/desktop/shell/shell/controlcenter/ControlCenter.qml b/desktop/shell/shell/controlcenter/ControlCenter.qml index 8e33851b..2cde762a 100644 --- a/desktop/shell/shell/controlcenter/ControlCenter.qml +++ b/desktop/shell/shell/controlcenter/ControlCenter.qml @@ -145,9 +145,6 @@ Item { readonly property var pageTitles: ({ "omarchy.monitor": Commons.I18n.t("monitor.display") }) property var page: null - // A page opened on its own (its bar icon, a shortcut): no way back to the - // main view, as the icon's own menu would be; Esc or a tap outside closes. - property bool standalone: false // 0 on the main view, 1 on the page; the push in between. property real pageShift: 0 NumberAnimation { @@ -159,25 +156,7 @@ Item { onFinished: if (root.pageShift === 0) root.dropPage() } - function hasPage(module) { return !!root.modules[module] } - - // Straight to a module's page, as its icon's menu: again closes. - function showModule(module) { - var panelForPage = root.modules[module] - if (!panelForPage) return - if (root.opened && root.standalone && root.page === panelForPage) { root.close(); return } - pageSlide.stop() - if (root.page && root.page !== panelForPage) root.page.hostShown = false - root.page = panelForPage - panelForPage.hostShown = true - root.standalone = true - root.pageShift = 1 - if (!root.opened) root.open() - Qt.callLater(function() { if (pageLoader.item) pageLoader.item.forceActiveFocus() }) - } - function showPage(panelForPage) { - root.standalone = false if (!root.opened) root.open() if (root.page && root.page !== panelForPage) root.page.hostShown = false root.page = panelForPage @@ -188,7 +167,6 @@ Item { } function leavePage(panelForPage) { if (root.page !== panelForPage) return - if (root.standalone) { root.close(); return } pageSlide.to = 0 pageSlide.restart() keyCatcher.forceActiveFocus() @@ -196,7 +174,6 @@ Item { function dropPage() { if (root.page) root.page.hostShown = false root.page = null - root.standalone = false root.pageShift = 0 } @@ -422,8 +399,8 @@ Item { function toggle(): void { root.toggle() } function open(): void { if (!root.opened) root.open() } function close(): void { root.close() } - // A module's page on its own, as its bar icon opens it: omarchy.monitor, … - function page(module: string): void { root.showModule(module) } + // Open at a module's page: omarchy.monitor, … + function page(module: string): void { root.openPage(module) } } // ------------------------------------------------------------- window @@ -692,7 +669,6 @@ Item { spacing: root.gap Item { - visible: !root.standalone width: parent.width height: root.touchMin Row { @@ -729,7 +705,7 @@ Item { sourceComponent: root.page ? root.page.pageContent : null // As tall as its content, within the screen; the content scrolls // beyond that. - readonly property real header: root.standalone ? 0 : root.touchMin + root.gap + readonly property real header: root.touchMin + root.gap readonly property real room: root.screenHeight - card.y - root.pad * 2 - header - Style.gapsOut height: item ? Math.min(item.implicitHeight, root.phone ? card.height - root.pad * 2 - header - Style.space(12) : room) : 0 } From 79dad4351cbc7cc67fd85b02c6c724643d3f403f Mon Sep 17 00:00:00 2001 From: Henrik Klee Date: Fri, 20 Nov 2026 02:04:16 +0800 Subject: [PATCH 04/32] Control center: its bar button; the Display panel back to upstream's rows A button at the end of the bar's right side opens the control center with one click: the mouse's way to what a finger pulls down. The bar's other icons stay upstream's. A migration adds it to existing users' bar layout. With rotation lock and Stay Awake in the control center, the Display panel drops them and is upstream's again apart from auto-brightness, in its popup and as the control center's page alike. Assisted-by: LLM --- desktop/shell/config/omarchy/shell.json | 3 +- desktop/shell/default/i18n/en/shell.json | 1 + desktop/shell/migrations/1795111372.sh | 20 ++++++ .../plugins/control-center/BarWidget.qml | 28 ++++++++ .../plugins/control-center/manifest.json | 17 +++++ .../shell/plugins/panels/monitor/Panel.qml | 67 +------------------ docs/upstream.md | 6 +- 7 files changed, 74 insertions(+), 68 deletions(-) create mode 100644 desktop/shell/migrations/1795111372.sh create mode 100644 desktop/shell/shell/plugins/control-center/BarWidget.qml create mode 100644 desktop/shell/shell/plugins/control-center/manifest.json diff --git a/desktop/shell/config/omarchy/shell.json b/desktop/shell/config/omarchy/shell.json index c75d48ee..8fcb62e6 100644 --- a/desktop/shell/config/omarchy/shell.json +++ b/desktop/shell/config/omarchy/shell.json @@ -15,7 +15,8 @@ { "id": "omarchy.bluetooth", "narrow": false }, { "id": "omarchy.network", "narrow": "left" }, { "id": "omarchy.monitor", "narrow": false }, - { "id": "omarchy.power" } + { "id": "omarchy.power" }, + { "id": "ipadlinux.controlcenter" } ] } }, diff --git a/desktop/shell/default/i18n/en/shell.json b/desktop/shell/default/i18n/en/shell.json index 17a0f741..02f0ee94 100644 --- a/desktop/shell/default/i18n/en/shell.json +++ b/desktop/shell/default/i18n/en/shell.json @@ -245,6 +245,7 @@ "clipboard.imageFrom": "Image from %1", "clipboard.screenshotFrom": "Screenshot from %1", "clipboard.search": "Search clipboard…", + "controlCenter.title": "Control center", "controlCenter.auto": "auto", "controlCenter.awake": "Awake", "controlCenter.balanced": "Balanced", diff --git a/desktop/shell/migrations/1795111372.sh b/desktop/shell/migrations/1795111372.sh new file mode 100644 index 00000000..2a9ead12 --- /dev/null +++ b/desktop/shell/migrations/1795111372.sh @@ -0,0 +1,20 @@ +echo "The bar gets the control center's button" + +# A user's bar layout is theirs (~/.config/omarchy-ipad/shell.json): the +# button goes at the end of its right section, unless it is there already. +config="$HOME/.config/omarchy-ipad/shell.json" +[[ -f $config ]] || exit 0 +python3 - "$config" <<'PY' +import json, sys +path = sys.argv[1] +with open(path) as f: + config = json.load(f) +right = config.get("bar", {}).get("layout", {}).get("right") +if isinstance(right, list) and not any(isinstance(w, dict) and w.get("id") == "ipadlinux.controlcenter" for w in right): + right.append({"id": "ipadlinux.controlcenter"}) + with open(path + ".new", "w") as f: + json.dump(config, f, indent=2) + f.write("\n") + import os + os.replace(path + ".new", path) +PY diff --git a/desktop/shell/shell/plugins/control-center/BarWidget.qml b/desktop/shell/shell/plugins/control-center/BarWidget.qml new file mode 100644 index 00000000..4b3bd117 --- /dev/null +++ b/desktop/shell/shell/plugins/control-center/BarWidget.qml @@ -0,0 +1,28 @@ +import QtQuick +import Quickshell +import qs.Ui +import qs.Commons + +// The control center's button: one click opens it (the mouse's way to what +// a finger pulls down from the top right). The bar's other icons stay +// upstream's, each opening its own panel. +BarWidget { + id: root + moduleName: "ipadlinux.controlcenter" + implicitWidth: button.implicitWidth + implicitHeight: button.implicitHeight + + readonly property var center: root.bar && root.bar.shell ? root.bar.shell.controlCenter : null + + BarIconButton { + id: button + anchors.fill: parent + bar: root.bar + text: "󰘮" + active: !!root.center && root.center.opened + tooltipText: I18n.t("controlCenter.title") + onPressed: function(mouseButton) { + if (mouseButton === Qt.LeftButton && root.center) root.center.toggle() + } + } +} diff --git a/desktop/shell/shell/plugins/control-center/manifest.json b/desktop/shell/shell/plugins/control-center/manifest.json new file mode 100644 index 00000000..a7f7c0fe --- /dev/null +++ b/desktop/shell/shell/plugins/control-center/manifest.json @@ -0,0 +1,17 @@ +{ + "schemaVersion": 1, + "id": "ipadlinux.controlcenter", + "name": "Control center", + "version": "1.0.0", + "author": "iPad Linux", + "description": "Open the control center", + "kinds": ["bar-widget"], + "entryPoints": { "barWidget": "BarWidget.qml" }, + "barWidget": { + "displayName": "Control center", + "description": "Open the control center", + "category": "System", + "defaultSection": "right", + "allowMultiple": false + } +} diff --git a/desktop/shell/shell/plugins/panels/monitor/Panel.qml b/desktop/shell/shell/plugins/panels/monitor/Panel.qml index 77c51a00..63d9a656 100644 --- a/desktop/shell/shell/plugins/panels/monitor/Panel.qml +++ b/desktop/shell/shell/plugins/panels/monitor/Panel.qml @@ -34,17 +34,11 @@ Panel { property string displaysJson: "" property var displays: [] - // Orchard: the tablet's own rows, which upstream's panel does not have: - // ambient-light auto-brightness (hidden without the tool), rotation lock, - // and Stay Awake (the shell's idle service owns its state and bar icon). + // Orchard: the tablet's own row, which upstream's panel does not have: + // ambient-light auto-brightness (hidden without the tool). Rotation lock and + // Stay Awake are the control center's toggles. property bool autoAvailable: false property bool autoOn: false - readonly property var idleService: bar?.shell?.firstPartyServiceFor("omarchy.idle") - readonly property bool stayAwake: idleService ? idleService.stayAwake === true : false - property bool rotationLocked: false - property bool rotationLoaded: false - readonly property string rotationHelper: (Quickshell.env("OMARCHY_PATH") || - "/usr/share/omarchy") + "/bin/omarchy-rotation-lock" // Orchard: the screen turns with the iPad (arch-ipad-rotate-output, under // the rotation lock); labwc has no command to turn it by hand, so upstream's // rotate menu stays shut. @@ -407,7 +401,6 @@ Panel { function refresh() { if (!stateProc.running) stateProc.running = true if (!autoReadProc.running && !autoWriteProc.running) autoReadProc.running = true - if (!rotationRead.running && !rotationWrite.running) rotationRead.running = true } // The focused display's brightness, for the bar icon's wheel and IPC. @@ -854,24 +847,6 @@ Panel { onRunningChanged: if (!running) root.refresh() } - Process { - id: rotationRead - command: [root.rotationHelper, "status"] - stdout: StdioCollector { - onStreamFinished: { - try { - root.rotationLocked = JSON.parse(text).locked === true - root.rotationLoaded = true - } catch (_) { root.rotationLoaded = false } - } - } - } - - Process { - id: rotationWrite - onExited: function(exitCode, exitStatus) { root.refresh() } - } - BarIconButton { id: button anchors.fill: parent @@ -1142,42 +1117,6 @@ Panel { onClicked: root.setAuto(!root.autoOn) } - // ---------- Orchard: rotation lock and Stay Awake ---------- - // Not on the control center's page: there they are toggles of - // their own on the main view. - PanelSeparator { - visible: !root.hosted - foreground: root.bar.foreground - } - - Toggle { - visible: !root.hosted - width: parent.width - label: "Rotation lock" - description: root.rotationLocked ? "Keep the current orientation" : "Turn the display with the iPad" - checked: root.rotationLocked - enabled: root.rotationLoaded && !rotationWrite.running - foreground: root.bar.foreground - fontFamily: root.bar.fontFamily - onClicked: { - rotationWrite.command = [root.rotationHelper, root.rotationLocked ? "off" : "on"] - rotationWrite.running = true - } - } - - Toggle { - visible: !root.hosted - width: parent.width - label: Commons.I18n.t("bar.stayAwake") - description: root.stayAwake ? "The screen stays on; no automatic lock or sleep" - : "Lock and sleep after the idle timeout" - checked: root.stayAwake - enabled: !!root.idleService - foreground: root.bar.foreground - fontFamily: root.bar.fontFamily - onClicked: root.idleService.setIdleEnabled(root.stayAwake) - } - // ---------- Text size ---------- PanelSeparator { foreground: root.bar.foreground diff --git a/docs/upstream.md b/docs/upstream.md index 216cbf77..b28b9ebf 100644 --- a/docs/upstream.md +++ b/docs/upstream.md @@ -45,8 +45,8 @@ apps need Chromium). **Taken unchanged** for the launcher's Uninstall: `omarchy-remove-launcher-entry`. **Changed for touch and the tablet in the shell.** -The Display panel is upstream's with three more rows (auto-brightness, -rotation lock, Stay Awake); its commands run on labwc (`omarchy-monitor-state` +The Display panel is upstream's with one more row (auto-brightness; +rotation lock and Stay Awake are the control center's); its commands run on labwc (`omarchy-monitor-state` reads wlr-randr, `omarchy-brightness-display` takes upstream's `--monitor`), the iPad's `Unknown-1` connector counts as the built-in display, and the rotate menu stays shut (the screen turns with the iPad), as do the resolution @@ -85,7 +85,7 @@ charger PM readiness. shipped here; `shell.json` adds the auto-brightness and captive-portal keys. **Our own files** (no upstream counterpart): the control center -(`shell/controlcenter/`), the status cluster (`shell/plugins/status/`), the launcher +(`shell/controlcenter/`, its bar button `shell/plugins/control-center/`), the status cluster (`shell/plugins/status/`), the launcher (`shell/launcher/`, `bin/omarchy-launcher-recent-files`, `bin/omarchy-launcher-backdrop`), the labwc config, theme renderer and window buttons (`labwc-*`, `render-labwc-*.py`), the on-screen keyboard From be3df9566a2de069ac9d55c2436bc2eed3cf4d96 Mon Sep 17 00:00:00 2001 From: Henrik Klee Date: Fri, 20 Nov 2026 02:07:07 +0800 Subject: [PATCH 05/32] Bar and control center: hover is a pointer's; the keyboard shows it is up - Hover and tooltips on the bar follow a mouse or touchpad only: Qt makes mouse events of a touch, which left a slot hovered (and its tooltip up) after the finger had gone. - The bar's keyboard button and the control center's Keyboard toggle are lit while the on-screen keyboard is up (omarchy-keyboard's state file). - On a phone's narrow bar the control center button waits in the overflow; a finger pulls the control center down there. Assisted-by: LLM --- desktop/shell/config/omarchy/shell.json | 2 +- desktop/shell/migrations/1795111372.sh | 4 ++- desktop/shell/shell/Ui/WidgetButton.qml | 33 ++++++++++--------- .../shell/controlcenter/ControlCenter.qml | 12 ++++++- desktop/shell/shell/plugins/bar/Bar.qml | 4 ++- .../shell/plugins/keyboard/BarWidget.qml | 11 +++++++ tests/test_bar_layout.py | 2 +- 7 files changed, 48 insertions(+), 20 deletions(-) diff --git a/desktop/shell/config/omarchy/shell.json b/desktop/shell/config/omarchy/shell.json index 8fcb62e6..10d42960 100644 --- a/desktop/shell/config/omarchy/shell.json +++ b/desktop/shell/config/omarchy/shell.json @@ -16,7 +16,7 @@ { "id": "omarchy.network", "narrow": "left" }, { "id": "omarchy.monitor", "narrow": false }, { "id": "omarchy.power" }, - { "id": "ipadlinux.controlcenter" } + { "id": "ipadlinux.controlcenter", "narrow": false } ] } }, diff --git a/desktop/shell/migrations/1795111372.sh b/desktop/shell/migrations/1795111372.sh index 2a9ead12..c5f99564 100644 --- a/desktop/shell/migrations/1795111372.sh +++ b/desktop/shell/migrations/1795111372.sh @@ -11,7 +11,9 @@ with open(path) as f: config = json.load(f) right = config.get("bar", {}).get("layout", {}).get("right") if isinstance(right, list) and not any(isinstance(w, dict) and w.get("id") == "ipadlinux.controlcenter" for w in right): - right.append({"id": "ipadlinux.controlcenter"}) + # On a phone's narrow bar it waits in the overflow: a finger pulls the + # control center down there. + right.append({"id": "ipadlinux.controlcenter", "narrow": False}) with open(path + ".new", "w") as f: json.dump(config, f, indent=2) f.write("\n") diff --git a/desktop/shell/shell/Ui/WidgetButton.qml b/desktop/shell/shell/Ui/WidgetButton.qml index e5c08000..0e884eb8 100644 --- a/desktop/shell/shell/Ui/WidgetButton.qml +++ b/desktop/shell/shell/Ui/WidgetButton.qml @@ -70,7 +70,7 @@ Item { readonly property int barSize: bar ? bar.barSize : Style.bar.sizeHorizontal readonly property real scaledHorizontalMargin: Style.spaceReal(horizontalMargin) readonly property real scaledVerticalPadding: Style.spaceReal(verticalPadding) - readonly property bool tooltipHovered: visible && interactive && !concealed && mouseArea.containsMouse + readonly property bool tooltipHovered: visible && interactive && !concealed && pointerHover.hovered // Width of the painted label, for bar chrome that wants to line up with the // text rather than with the slot it sits in. Zero on icon-only buttons. readonly property real labelWidth: label.visible ? label.implicitWidth : 0 @@ -169,6 +169,23 @@ Item { } } + // Orchard: tooltips and hover reveal follow a pointer only. Qt makes mouse + // events of a touch, and the MouseArea's own hover then stayed on after the + // finger had gone, with a tooltip to match. + HoverHandler { + id: pointerHover + enabled: root.interactive + acceptedDevices: PointerDevice.Mouse | PointerDevice.TouchPad + onHoveredChanged: { + if (root.bar) { + if (hovered) root.bar.showTooltip(root, root.tooltipText) + else root.bar.hideTooltip(root) + } + if (root.maintainIndicatorReveal && root.revealHost && root.revealHost.setIndicatorItemHovered) + root.revealHost.setIndicatorItemHovered(hovered) + } + } + MouseArea { id: mouseArea anchors.fill: parent @@ -177,20 +194,6 @@ Item { enabled: root.interactive hoverEnabled: true cursorShape: root.pressable ? Qt.PointingHandCursor : Qt.ArrowCursor - onEntered: { - if (root.bar) { - root.bar.showTooltip(root, root.tooltipText) - } - if (root.maintainIndicatorReveal && root.revealHost && root.revealHost.setIndicatorItemHovered) - root.revealHost.setIndicatorItemHovered(true) - } - onExited: { - if (root.bar) { - root.bar.hideTooltip(root) - } - if (root.maintainIndicatorReveal && root.revealHost && root.revealHost.setIndicatorItemHovered) - root.revealHost.setIndicatorItemHovered(false) - } onPressed: root.touchLongPressTriggered = false onPressAndHold: function(mouse) { if (root.pressable && mouse.button === Qt.LeftButton diff --git a/desktop/shell/shell/controlcenter/ControlCenter.qml b/desktop/shell/shell/controlcenter/ControlCenter.qml index 2cde762a..49de25e1 100644 --- a/desktop/shell/shell/controlcenter/ControlCenter.qml +++ b/desktop/shell/shell/controlcenter/ControlCenter.qml @@ -59,6 +59,16 @@ Item { : !(source && source.audio) || source.audio.muted readonly property bool micKnown: UntypedInput.active ? UntypedInput.known : !!(source && source.audio) + // The on-screen keyboard's visibility, as omarchy-keyboard records it. + FileView { + id: keyboardState + path: (Quickshell.env("XDG_RUNTIME_DIR") || "/tmp") + "/omarchy-keyboard-visible" + watchChanges: true + printErrors: false + onFileChanged: reload() + } + readonly property bool keyboardShown: keyboardState.loaded && keyboardState.text().trim() === "1" + property int brightness: -1 property bool autoBrightness: false @@ -235,7 +245,7 @@ Item { { key: "awake", glyph: "", label: Commons.I18n.t("controlCenter.awake"), on: root.stayAwake, enabled: !!root.idleService, act: root.toggleAwake }, { key: "keyboard", glyph: "󰌌", label: Commons.I18n.t("controlCenter.keyboard"), - on: false, enabled: true, act: root.showKeyboard } + on: root.keyboardShown, enabled: true, act: root.showKeyboard } ] // Live once their backend exists (power profiles, Focus, Night Light, media). readonly property var later: [ diff --git a/desktop/shell/shell/plugins/bar/Bar.qml b/desktop/shell/shell/plugins/bar/Bar.qml index ab1470e9..4ce54d96 100644 --- a/desktop/shell/shell/plugins/bar/Bar.qml +++ b/desktop/shell/shell/plugins/bar/Bar.qml @@ -2980,7 +2980,9 @@ Item { root.unregisterModuleSlot(slot) } - HoverHandler { id: moduleHover } + // Orchard: hover is a pointer's. A finger leaves no hover behind (Qt + // makes mouse events of a touch, which kept a slot hovered after it). + HoverHandler { id: moduleHover; acceptedDevices: PointerDevice.Mouse | PointerDevice.TouchPad } // The widget at its own size. Lifted out by a drag, it folds away with // its room. diff --git a/desktop/shell/shell/plugins/keyboard/BarWidget.qml b/desktop/shell/shell/plugins/keyboard/BarWidget.qml index 02d285c2..8bcf292e 100644 --- a/desktop/shell/shell/plugins/keyboard/BarWidget.qml +++ b/desktop/shell/shell/plugins/keyboard/BarWidget.qml @@ -1,5 +1,6 @@ import QtQuick import Quickshell +import Quickshell.Io import qs.Ui BarWidget { @@ -8,11 +9,21 @@ BarWidget { implicitWidth: button.implicitWidth implicitHeight: button.implicitHeight + // Lit while the keyboard is up, as omarchy-keyboard records it. + FileView { + id: keyboardState + path: (Quickshell.env("XDG_RUNTIME_DIR") || "/tmp") + "/omarchy-keyboard-visible" + watchChanges: true + printErrors: false + onFileChanged: reload() + } + BarIconButton { id: button anchors.fill: parent bar: root.bar text: "󰌌" + active: keyboardState.loaded && keyboardState.text().trim() === "1" onPressed: function(mouseButton) { if (mouseButton === Qt.LeftButton && root.bar) root.bar.run(Quickshell.env("OMARCHY_PATH") + "/bin/omarchy-keyboard toggle") diff --git a/tests/test_bar_layout.py b/tests/test_bar_layout.py index 06cedb59..d7f3b178 100644 --- a/tests/test_bar_layout.py +++ b/tests/test_bar_layout.py @@ -59,7 +59,7 @@ def test_a_narrow_bar_drops_no_widget(self): second = pages['pages'][1] self.assertEqual(second['left'], ['omarchy.menu', 'omarchy.audio', 'omarchy.bluetooth']) self.assertEqual(second['center'], ['omarchy.clock']) - self.assertEqual(second['right'], ['omarchy.monitor', 'omarchy.overflow']) + self.assertEqual(second['right'], ['omarchy.monitor', 'ipadlinux.controlcenter', 'omarchy.overflow']) # Three 40 px touch slots a side, as on the first page. self.assertTrue(all(len(page[side]) <= 3 for page in pages['pages'] for side in ('left', 'right'))) self.assertEqual(pages['pages'][2], pages['pages'][0]) From 566aad951bd9be04180c44bfbedaa461e9942459 Mon Sep 17 00:00:00 2001 From: Henrik Klee Date: Fri, 20 Nov 2026 02:11:33 +0800 Subject: [PATCH 06/32] Bar: Stay Awake joins the right side, the keyboard button leaves - Stay Awake's indicator moves from beside the clock to the start of the bar's right side, where the status cluster puts it. - The keyboard button leaves the bar: the swipe up from the bottom and the control center's Keyboard toggle bring the keyboard up. The plugin stays for anyone who adds it back. - The control center button shows no state of its own. - The control center drops its power button: ending the session has one home, the launcher. A migration moves existing users' bar layouts the same way where they still have these as the package placed them. Assisted-by: LLM --- desktop/shell/config/omarchy/shell.json | 4 +-- desktop/shell/migrations/1795111754.sh | 36 +++++++++++++++++++ .../shell/controlcenter/ControlCenter.qml | 26 ++------------ .../plugins/control-center/BarWidget.qml | 1 - tests/test_bar_layout.py | 2 +- 5 files changed, 42 insertions(+), 27 deletions(-) create mode 100644 desktop/shell/migrations/1795111754.sh diff --git a/desktop/shell/config/omarchy/shell.json b/desktop/shell/config/omarchy/shell.json index 10d42960..a92a65e3 100644 --- a/desktop/shell/config/omarchy/shell.json +++ b/desktop/shell/config/omarchy/shell.json @@ -6,11 +6,11 @@ "background": "opaque", "layout": { "left": [{ "id": "omarchy.menu" }], - "centerBegin": [{ "id": "omarchy.indicators", "items": ["StayAwake"] }], + "centerBegin": [], "center": [{ "id": "omarchy.clock", "format": "HH:mm" }], "centerEnd": [], "right": [ - { "id": "ipadlinux.keyboard", "narrow": "left" }, + { "id": "omarchy.indicators", "items": ["StayAwake"], "narrow": "left" }, { "id": "omarchy.audio", "narrow": false }, { "id": "omarchy.bluetooth", "narrow": false }, { "id": "omarchy.network", "narrow": "left" }, diff --git a/desktop/shell/migrations/1795111754.sh b/desktop/shell/migrations/1795111754.sh new file mode 100644 index 00000000..4e5538c7 --- /dev/null +++ b/desktop/shell/migrations/1795111754.sh @@ -0,0 +1,36 @@ +echo "The bar's right side: Stay Awake joins it, the keyboard button leaves" + +# The swipe up from the bottom and the control center's Keyboard toggle bring +# the keyboard up; Stay Awake's indicator sits with the status icons. A user's +# own layout (~/.config/omarchy-ipad/shell.json) changes only where it still +# has these as the package placed them. +config="$HOME/.config/omarchy-ipad/shell.json" +[[ -f $config ]] || exit 0 +python3 - "$config" <<'PY' +import json, os, sys +path = sys.argv[1] +with open(path) as f: + config = json.load(f) +layout = config.get("bar", {}).get("layout", {}) +right = layout.get("right") +if not isinstance(right, list): + sys.exit(0) +changed = False +kept = [w for w in right if not (isinstance(w, dict) and w.get("id") == "ipadlinux.keyboard")] +if len(kept) != len(right): + right[:] = kept + changed = True +begin = layout.get("centerBegin") +if isinstance(begin, list): + for widget in list(begin): + if isinstance(widget, dict) and widget.get("id") == "omarchy.indicators" and widget.get("items") == ["StayAwake"]: + begin.remove(widget) + if not any(isinstance(w, dict) and w.get("id") == "omarchy.indicators" for w in right): + right.insert(0, dict(widget, narrow="left")) + changed = True +if changed: + with open(path + ".new", "w") as f: + json.dump(config, f, indent=2) + f.write("\n") + os.replace(path + ".new", path) +PY diff --git a/desktop/shell/shell/controlcenter/ControlCenter.qml b/desktop/shell/shell/controlcenter/ControlCenter.qml index 49de25e1..2bd125ef 100644 --- a/desktop/shell/shell/controlcenter/ControlCenter.qml +++ b/desktop/shell/shell/controlcenter/ControlCenter.qml @@ -196,10 +196,6 @@ Item { function toggleRotation() { run([omarchy("omarchy-rotation-lock"), rotation.locked ? "off" : "on"]); rotation.locked = !rotation.locked } function toggleAwake() { if (idleService) idleService.setIdleEnabled(root.stayAwake) } function showKeyboard() { root.close(); run([omarchy("omarchy-keyboard"), "toggle"]) } - function sessionActions() { - root.close() - if (root.shell) root.shell.summon("omarchy.menu", JSON.stringify({ menu: "system" })) - } function setVolume(value) { if (sink && sink.audio) sink.audio.volume = Math.max(0, Math.min(1, value)) } @@ -649,7 +645,7 @@ Item { } } - // Battery line and the session actions (iPad: here; phone: at the foot). + // The battery line (iPad: here; phone: at the foot). Item { id: footer width: content.width @@ -1044,7 +1040,8 @@ Item { } component FooterParts: Item { - // Battery line: opens the battery page; the power button the session. + // Battery line: opens the battery page. Ending the session is the + // launcher's (its footer, a phone's System tab), not the control center's. Cell { id: batteryCell visible: root.batteryLine !== "" @@ -1065,22 +1062,5 @@ Item { } MouseArea { anchors.fill: parent; onClicked: batteryCell.activate() } } - Cell { - id: powerCell - anchors.right: parent.right - width: root.touchMin - height: parent.height - color: "transparent" - border.width: focused ? Math.max(1, Style.space(1)) : 0 - onActivated: root.sessionActions() - Text { - anchors.centerIn: parent - text: "󰐥" - color: Commons.Color.urgent - font.family: Style.font.family - font.pixelSize: Style.font.title - } - MouseArea { anchors.fill: parent; onClicked: powerCell.activate() } - } } } diff --git a/desktop/shell/shell/plugins/control-center/BarWidget.qml b/desktop/shell/shell/plugins/control-center/BarWidget.qml index 4b3bd117..8ca36782 100644 --- a/desktop/shell/shell/plugins/control-center/BarWidget.qml +++ b/desktop/shell/shell/plugins/control-center/BarWidget.qml @@ -19,7 +19,6 @@ BarWidget { anchors.fill: parent bar: root.bar text: "󰘮" - active: !!root.center && root.center.opened tooltipText: I18n.t("controlCenter.title") onPressed: function(mouseButton) { if (mouseButton === Qt.LeftButton && root.center) root.center.toggle() diff --git a/tests/test_bar_layout.py b/tests/test_bar_layout.py index d7f3b178..21aa156c 100644 --- a/tests/test_bar_layout.py +++ b/tests/test_bar_layout.py @@ -27,7 +27,7 @@ def test_a_phone_bar_fits_beside_the_clock(self): console.log(JSON.stringify(narrow)); ''', BAR / 'BarModel.js', CONFIG)) ids = {section: [entry['id'] for entry in entries] for section, entries in narrow.items()} - self.assertEqual(ids['left'], ['omarchy.menu', 'ipadlinux.keyboard', 'omarchy.network']) + self.assertEqual(ids['left'], ['omarchy.menu', 'omarchy.indicators', 'omarchy.network']) self.assertEqual(ids['center'], ['omarchy.clock']) self.assertEqual(ids['right'], ['omarchy.power', 'omarchy.overflow']) # Touch slots are 40 px, the battery with its percentage two of them, and From 3715fba6157e3b6a4b67ea0dafa70a4e52483926 Mon Sep 17 00:00:00 2001 From: Henrik Klee Date: Fri, 20 Nov 2026 02:13:00 +0800 Subject: [PATCH 07/32] Control center: no footer row without a battery line Assisted-by: LLM --- desktop/shell/shell/controlcenter/ControlCenter.qml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/desktop/shell/shell/controlcenter/ControlCenter.qml b/desktop/shell/shell/controlcenter/ControlCenter.qml index 2bd125ef..f49f38e5 100644 --- a/desktop/shell/shell/controlcenter/ControlCenter.qml +++ b/desktop/shell/shell/controlcenter/ControlCenter.qml @@ -650,13 +650,14 @@ Item { id: footer width: content.width height: root.touchMin - visible: !root.phone + // Only with a battery to show: nothing else lives here. + visible: !root.phone && root.batteryLine !== "" FooterParts { anchors.fill: parent } } } Item { - visible: root.phone && root.pageShift < 1 + visible: root.phone && root.pageShift < 1 && root.batteryLine !== "" x: root.pad - root.pageShift * card.width width: parent.width - root.pad * 2 height: root.touchMin From b257ba2b88088158099c87c5f93d6ea09d7e7467 Mon Sep 17 00:00:00 2001 From: Henrik Klee Date: Fri, 20 Nov 2026 02:15:22 +0800 Subject: [PATCH 08/32] Control center: the Network page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The network panel's own content as a control center page, as Display's is: a long press on the Wi-Fi tile (or right on it) opens it, ← or Esc goes back. Its header says Wi-Fi, or Network while a wired connection is the one in use. The bar's network icon and Super+Ctrl+N keep opening the panel's popup. Assisted-by: LLM --- desktop/shell/default/i18n/en/shell.json | 1 + desktop/shell/shell/controlcenter/ControlCenter.qml | 10 ++++++++-- desktop/shell/shell/plugins/panels/network/Panel.qml | 7 +++++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/desktop/shell/default/i18n/en/shell.json b/desktop/shell/default/i18n/en/shell.json index 02f0ee94..76cf4b6e 100644 --- a/desktop/shell/default/i18n/en/shell.json +++ b/desktop/shell/default/i18n/en/shell.json @@ -256,6 +256,7 @@ "controlCenter.media": "Media", "controlCenter.mic": "Mic", "controlCenter.night": "Night", + "controlCenter.network": "Network", "controlCenter.notConnected": "Not connected", "controlCenter.off": "Off", "controlCenter.rotation": "Rotation", diff --git a/desktop/shell/shell/controlcenter/ControlCenter.qml b/desktop/shell/shell/controlcenter/ControlCenter.qml index f49f38e5..39d1d0e9 100644 --- a/desktop/shell/shell/controlcenter/ControlCenter.qml +++ b/desktop/shell/shell/controlcenter/ControlCenter.qml @@ -13,6 +13,7 @@ import "../plugins/panels/power" as Power import "../plugins/panels/bluetooth/Model.js" as BluetoothModel import "../plugins/status" as StatusParts import "../plugins/panels/monitor" as Monitor +import "../plugins/panels/network" as NetworkPanel // The control center (SHELL-SPEC, step 2): the main view. States you flip // and the two sliders, over the same status objects the bar and the lock @@ -150,9 +151,14 @@ Item { Item { visible: false Monitor.Panel { id: displayModule; host: pageHost; bar: pageHost; moduleName: "omarchy.monitor" } + NetworkPanel.Panel { id: networkModule; host: pageHost; bar: pageHost; moduleName: "omarchy.network" } } - readonly property var modules: ({ "omarchy.monitor": displayModule }) - readonly property var pageTitles: ({ "omarchy.monitor": Commons.I18n.t("monitor.display") }) + readonly property var modules: ({ "omarchy.monitor": displayModule, "omarchy.network": networkModule }) + readonly property var pageTitles: ({ + "omarchy.monitor": Commons.I18n.t("monitor.display"), + // Wired when that is the connection in use, as the page then shows it. + "omarchy.network": network.kind === "ethernet" ? Commons.I18n.t("controlCenter.network") : Commons.I18n.t("controlCenter.wifi") + }) property var page: null // 0 on the main view, 1 on the page; the push in between. diff --git a/desktop/shell/shell/plugins/panels/network/Panel.qml b/desktop/shell/shell/plugins/panels/network/Panel.qml index c48ba79b..85f70688 100644 --- a/desktop/shell/shell/plugins/panels/network/Panel.qml +++ b/desktop/shell/shell/plugins/panels/network/Panel.qml @@ -240,7 +240,7 @@ Panel { } ShellIpc { - target: "omarchy.network" + target: root.hosted ? "" : "omarchy.network" function open() { root.open() } function close() { root.close() } @@ -1085,12 +1085,15 @@ Panel { // outside-click via an overlay MouseArea + Region mask that lets the bar // remain clickable, fade animation, popout coordination). What stays // here is the wifi-specific UI inside. + // The content, for a host that shows it as a page (the control center). + readonly property Component pageContent: panel.content + KeyboardPanel { id: panel anchorItem: button owner: root bar: root.bar - open: root.opened + open: root.popupOpen focusTarget: root.passwordSsid !== "" && root.credentialFocusTarget ? root.credentialFocusTarget : panel.loadedContent contentWidth: panel.fittedContentWidth(Style.space(380)) contentHeight: panel.fittedContentHeight(panel.loadedContentHeight) From d1a97ce7fe40646dc752bdc443fa27889445a9a5 Mon Sep 17 00:00:00 2001 From: Henrik Klee Date: Fri, 20 Nov 2026 02:19:11 +0800 Subject: [PATCH 09/32] Control center: one header on a page; a popup goes before it opens - A page's header is the panel's own title row: hosted, its icon is the way back (Display, Network). The control center's separate header row goes. - Opening the control center (button, shortcut or pull-down) first closes a bar panel's open popup: it is never shown over one. Assisted-by: LLM --- .../shell/controlcenter/ControlCenter.qml | 49 +++++-------------- .../shell/plugins/panels/monitor/Panel.qml | 9 +++- .../shell/plugins/panels/network/Panel.qml | 13 +++-- 3 files changed, 30 insertions(+), 41 deletions(-) diff --git a/desktop/shell/shell/controlcenter/ControlCenter.qml b/desktop/shell/shell/controlcenter/ControlCenter.qml index 39d1d0e9..c84db2b9 100644 --- a/desktop/shell/shell/controlcenter/ControlCenter.qml +++ b/desktop/shell/shell/controlcenter/ControlCenter.qml @@ -154,11 +154,6 @@ Item { NetworkPanel.Panel { id: networkModule; host: pageHost; bar: pageHost; moduleName: "omarchy.network" } } readonly property var modules: ({ "omarchy.monitor": displayModule, "omarchy.network": networkModule }) - readonly property var pageTitles: ({ - "omarchy.monitor": Commons.I18n.t("monitor.display"), - // Wired when that is the connection in use, as the page then shows it. - "omarchy.network": network.kind === "ethernet" ? Commons.I18n.t("controlCenter.network") : Commons.I18n.t("controlCenter.wifi") - }) property var page: null // 0 on the main view, 1 on the page; the push in between. @@ -302,7 +297,15 @@ Item { root.focusIndex = -1 } + // A bar panel's popup goes first: the control center is never over one. + function closePopout() { + var bar = root.shell ? root.shell.bar : null + var popout = bar ? bar.activePopout : null + if (popout && typeof popout.close === "function") popout.close() + } + function open() { + root.closePopout() root.prepare() root.opened = true root.mapped = true @@ -331,6 +334,7 @@ Item { function beginPull() { spring.running = false if (!root.opened) { + root.closePopout() root.prepare() root.reveal = 0 root.mapped = true @@ -672,7 +676,8 @@ Item { FooterParts { anchors.fill: parent } } - // The page: a header with the way back, then the panel's content. + // The page: the panel's content, whose own title row is the header (its + // icon turns into the way back when hosted). Column { id: pageView visible: root.page !== null @@ -681,36 +686,6 @@ Item { width: parent.width - root.pad * 2 spacing: root.gap - Item { - width: parent.width - height: root.touchMin - Row { - anchors.verticalCenter: parent.verticalCenter - spacing: Style.space(8) - Text { - anchors.verticalCenter: parent.verticalCenter - text: "󰁍" - color: root.text - font.family: Style.font.family - font.pixelSize: Style.font.title - } - Text { - anchors.verticalCenter: parent.verticalCenter - textFormat: Text.PlainText - text: root.page ? (root.pageTitles[root.page.moduleName] || "") : "" - color: root.text - font.family: Style.font.family - font.pixelSize: Style.font.title - font.bold: true - } - } - MouseArea { - width: Math.max(root.touchMin, parent.width / 2) - height: parent.height - onClicked: if (root.page) root.leavePage(root.page) - } - } - Loader { id: pageLoader width: parent.width @@ -718,7 +693,7 @@ Item { sourceComponent: root.page ? root.page.pageContent : null // As tall as its content, within the screen; the content scrolls // beyond that. - readonly property real header: root.touchMin + root.gap + readonly property real header: 0 readonly property real room: root.screenHeight - card.y - root.pad * 2 - header - Style.gapsOut height: item ? Math.min(item.implicitHeight, root.phone ? card.height - root.pad * 2 - header - Style.space(12) : room) : 0 } diff --git a/desktop/shell/shell/plugins/panels/monitor/Panel.qml b/desktop/shell/shell/plugins/panels/monitor/Panel.qml index 63d9a656..81ae5fe1 100644 --- a/desktop/shell/shell/plugins/panels/monitor/Panel.qml +++ b/desktop/shell/shell/plugins/panels/monitor/Panel.qml @@ -941,12 +941,19 @@ Panel { Text { id: heroIcon textFormat: Text.PlainText - text: root.displayGlyph(root.current) + // Orchard: as a control center page, the way back. + text: root.hosted ? "󰁍" : root.displayGlyph(root.current) color: root.bar.foreground font.family: root.bar.fontFamily font.pixelSize: Style.font.display anchors.left: parent.left anchors.verticalCenter: parent.verticalCenter + MouseArea { + anchors.fill: parent + anchors.margins: -Style.space(10) + enabled: root.hosted + onClicked: root.close() + } } Column { diff --git a/desktop/shell/shell/plugins/panels/network/Panel.qml b/desktop/shell/shell/plugins/panels/network/Panel.qml index 85f70688..0560d1e4 100644 --- a/desktop/shell/shell/plugins/panels/network/Panel.qml +++ b/desktop/shell/shell/plugins/panels/network/Panel.qml @@ -1220,13 +1220,20 @@ Panel { Text { id: heroIcon textFormat: Text.PlainText - text: root.icon - color: root.restricted ? root.bar.urgent : root.bar.foreground + // Orchard: as a control center page, the way back. + text: root.hosted ? "󰁍" : root.icon + color: !root.hosted && root.restricted ? root.bar.urgent : root.bar.foreground font.family: root.bar.fontFamily font.pixelSize: Style.font.display - opacity: root.networkManagerAvailable ? 1.0 : 0.5 + opacity: root.hosted || root.networkManagerAvailable ? 1.0 : 0.5 anchors.left: parent.left anchors.verticalCenter: parent.verticalCenter + MouseArea { + anchors.fill: parent + anchors.margins: -Style.space(10) + enabled: root.hosted + onClicked: root.close() + } } // Sharing belongs to the connected-network hero rather than the scan From b119add34e6e2e58bcaef660a0014dc4a63b75b9 Mon Sep 17 00:00:00 2001 From: Henrik Klee Date: Fri, 20 Nov 2026 02:20:33 +0800 Subject: [PATCH 10/32] Control center: the Network page's arrow goes back The network panel closes through its own close(), which hid the popup directly; hosted, it now leaves the page (the prompt cleanup stays). Assisted-by: LLM --- desktop/shell/shell/plugins/panels/network/Panel.qml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/desktop/shell/shell/plugins/panels/network/Panel.qml b/desktop/shell/shell/plugins/panels/network/Panel.qml index 0560d1e4..51522bd6 100644 --- a/desktop/shell/shell/plugins/panels/network/Panel.qml +++ b/desktop/shell/shell/plugins/panels/network/Panel.qml @@ -18,8 +18,10 @@ Panel { manageIpc: false // Centralized close so callers can't forget to drop the passphrase prompt. + // Orchard: as a control center page, closing is going back. function close() { - root.controller.hide() + if (root.hosted) root.host.leavePage(root) + else root.controller.hide() cancelPasswordPrompt() optionsSsid = "" } From 5b9318dd477c0980841d12bcb1e6996cb20f5302 Mon Sep 17 00:00:00 2001 From: Henrik Klee Date: Fri, 20 Nov 2026 02:21:39 +0800 Subject: [PATCH 11/32] Control center: a page's back arrow shrinks when pressed Assisted-by: LLM --- desktop/shell/shell/plugins/panels/monitor/Panel.qml | 4 ++++ desktop/shell/shell/plugins/panels/network/Panel.qml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/desktop/shell/shell/plugins/panels/monitor/Panel.qml b/desktop/shell/shell/plugins/panels/monitor/Panel.qml index 81ae5fe1..e8f3ce95 100644 --- a/desktop/shell/shell/plugins/panels/monitor/Panel.qml +++ b/desktop/shell/shell/plugins/panels/monitor/Panel.qml @@ -948,7 +948,11 @@ Panel { font.pixelSize: Style.font.display anchors.left: parent.left anchors.verticalCenter: parent.verticalCenter + // Pressed, it shrinks, as the control center's controls do. + scale: backPress.pressed ? 0.85 : 1 + Behavior on scale { NumberAnimation { duration: Style.duration(120); easing.type: Easing.OutCubic } } MouseArea { + id: backPress anchors.fill: parent anchors.margins: -Style.space(10) enabled: root.hosted diff --git a/desktop/shell/shell/plugins/panels/network/Panel.qml b/desktop/shell/shell/plugins/panels/network/Panel.qml index 51522bd6..8cb23d85 100644 --- a/desktop/shell/shell/plugins/panels/network/Panel.qml +++ b/desktop/shell/shell/plugins/panels/network/Panel.qml @@ -1230,7 +1230,11 @@ Panel { opacity: root.hosted || root.networkManagerAvailable ? 1.0 : 0.5 anchors.left: parent.left anchors.verticalCenter: parent.verticalCenter + // Pressed, it shrinks, as the control center's controls do. + scale: backPress.pressed ? 0.85 : 1 + Behavior on scale { NumberAnimation { duration: Style.duration(120); easing.type: Easing.OutCubic } } MouseArea { + id: backPress anchors.fill: parent anchors.margins: -Style.space(10) enabled: root.hosted From f041a27e5491f9984d73f000f478a9ffe4260146 Mon Sep 17 00:00:00 2001 From: Henrik Klee Date: Fri, 20 Nov 2026 02:25:07 +0800 Subject: [PATCH 12/32] Control center: from its bar button, a popup like the bar's others Clicked open from its button, the control center fades in growing from 97 % toward the button and goes in two thirds of the time, upstream's popup timing and curve, and the screen does not dim; a click outside closes it. The pull-down and Super+Ctrl+1 keep the slide; a phone keeps the whole screen. Assisted-by: LLM --- .../shell/controlcenter/ControlCenter.qml | 55 ++++++++++++++++--- .../plugins/control-center/BarWidget.qml | 6 +- 2 files changed, 50 insertions(+), 11 deletions(-) diff --git a/desktop/shell/shell/controlcenter/ControlCenter.qml b/desktop/shell/shell/controlcenter/ControlCenter.qml index c84db2b9..aec3fd95 100644 --- a/desktop/shell/shell/controlcenter/ControlCenter.qml +++ b/desktop/shell/shell/controlcenter/ControlCenter.qml @@ -305,11 +305,15 @@ Item { } function open() { + root.popupStyle = false + root.show() + } + function show() { root.closePopout() root.prepare() root.opened = true root.mapped = true - if (panel.contentRevealed) root.settle(1, 0) + if (panel.contentRevealed) root.animateIn() Qt.callLater(function() { keyCatcher.forceActiveFocus() }) } function close() { @@ -317,10 +321,41 @@ Item { if (!root.opened) return root.closingFromOpen = true root.opened = false - root.settle(0, 0) + if (root.popupStyle) { spring.running = false; popupOut.restart() } + else root.settle(0, 0) } function toggle() { root.opened ? root.close() : root.open() } + // Clicked open from its bar button, it is a popup like the bar's others + // (upstream's KeyboardPanel): it fades in growing from just under full + // size toward the button, goes in two thirds of the time, and the screen + // does not dim. A phone keeps the whole screen. + property bool popupStyle: false + function togglePopup() { + if (root.opened) { root.close(); return } + root.popupStyle = !root.phone + root.show() + } + function animateIn() { + if (root.popupStyle) { spring.running = false; popupOut.stop(); popupIn.restart() } + else root.settle(1, 0) + } + NumberAnimation { + id: popupIn + target: root; property: "reveal"; to: 1 + duration: Style.duration(180) + easing.type: Easing.Bezier + easing.bezierCurve: Style.easeOut + } + NumberAnimation { + id: popupOut + target: root; property: "reveal"; to: 0 + duration: Style.duration(120) + easing.type: Easing.Bezier + easing.bezierCurve: Style.easeOut + onFinished: if (!root.opened) { root.mapped = false; root.dropPage() } + } + // A finger pulls it down from the top edge (the bar), or up to put it // away: it follows the finger, past its place only against resistance. // Let go, it keeps the finger's speed and a spring carries it to open or @@ -333,6 +368,9 @@ Item { function beginPull() { spring.running = false + popupIn.stop() + popupOut.stop() + root.popupStyle = false if (!root.opened) { root.closePopout() root.prepare() @@ -428,7 +466,7 @@ Item { onContentRevealedChanged: if (contentRevealed && root.opened && !root.pulling) { root.reveal = 0 - root.settle(1, 0) + root.animateIn() keyCatcher.forceActiveFocus() } @@ -440,7 +478,7 @@ Item { width: parent.width height: parent.height - y color: root.phone ? Commons.Color.menu.background : Commons.Color.menu.scrim - opacity: Math.max(0, Math.min(1, root.reveal)) + opacity: root.popupStyle ? 0 : Math.max(0, Math.min(1, root.reveal)) MouseArea { anchors.fill: parent acceptedButtons: Qt.LeftButton | Qt.RightButton @@ -544,21 +582,22 @@ Item { // Its bottom edge is where the finger is: reveal is the finger's way // down as a share of the card's bottom. On the way it grows out of its // own top centre and fades in; the slide is what keeps the scaled bottom under the finger. - readonly property real grow: 0.86 + 0.14 * root.reveal + // As a popup: it grows from 97 % toward its button and fades. + readonly property real grow: root.popupStyle ? 0.97 + 0.03 * root.reveal : 0.86 + 0.14 * root.reveal transform: [ Scale { - origin.x: card.width / 2 + origin.x: root.popupStyle ? card.width : card.width / 2 origin.y: 0 xScale: card.grow yScale: card.grow }, - Translate { y: root.reveal * root.pullSpan - card.y - card.height * card.grow } + Translate { y: root.popupStyle ? 0 : root.reveal * root.pullSpan - card.y - card.height * card.grow } ] // Coming in: solid within the first quarter of the way, most of it at // once. Going out (let go to close, or pushed up from open): it fades // with its way up, gone as its bottom edge reaches the status bar. readonly property real barShare: Math.min(0.9, root.barInset / root.pullSpan) - opacity: root.leaving + opacity: root.popupStyle ? root.reveal : root.leaving ? Math.max(0, Math.min(1, (root.reveal - barShare) / (1 - barShare))) : 1 - Math.pow(1 - Math.max(0, Math.min(1, root.reveal / 0.25)), 2) diff --git a/desktop/shell/shell/plugins/control-center/BarWidget.qml b/desktop/shell/shell/plugins/control-center/BarWidget.qml index 8ca36782..25d47da2 100644 --- a/desktop/shell/shell/plugins/control-center/BarWidget.qml +++ b/desktop/shell/shell/plugins/control-center/BarWidget.qml @@ -3,8 +3,8 @@ import Quickshell import qs.Ui import qs.Commons -// The control center's button: one click opens it (the mouse's way to what -// a finger pulls down from the top right). The bar's other icons stay +// The control center's button: one click opens it as a popup, as the bar's +// other icons open theirs (a finger pulls it down from the top right). The bar's other icons stay // upstream's, each opening its own panel. BarWidget { id: root @@ -21,7 +21,7 @@ BarWidget { text: "󰘮" tooltipText: I18n.t("controlCenter.title") onPressed: function(mouseButton) { - if (mouseButton === Qt.LeftButton && root.center) root.center.toggle() + if (mouseButton === Qt.LeftButton && root.center) root.center.togglePopup() } } } From 9325ad76b7a50241f77902f5e2e26b7f7f2970bc Mon Sep 17 00:00:00 2001 From: Henrik Klee Date: Fri, 20 Nov 2026 02:31:57 +0800 Subject: [PATCH 13/32] Control center: Audio, Bluetooth and Battery pages The audio, Bluetooth and power panels' own content as control center pages, as Display's and Network's are: a long press on volume opens Audio, on the Bluetooth tile Bluetooth, the battery line Battery. Hosted, each panel's title icon is the way back. Their bar icons, shortcuts and IPC keep opening the popups. Without a battery the power panel refuses to open, as upstream's does; the control center shows no battery line then. Assisted-by: LLM --- .../shell/controlcenter/ControlCenter.qml | 12 +++++++++- .../shell/plugins/panels/audio/Panel.qml | 20 ++++++++++++++--- .../shell/plugins/panels/bluetooth/Panel.qml | 22 +++++++++++++++---- .../shell/plugins/panels/power/Panel.qml | 20 ++++++++++++++--- 4 files changed, 63 insertions(+), 11 deletions(-) diff --git a/desktop/shell/shell/controlcenter/ControlCenter.qml b/desktop/shell/shell/controlcenter/ControlCenter.qml index aec3fd95..1b2fe23c 100644 --- a/desktop/shell/shell/controlcenter/ControlCenter.qml +++ b/desktop/shell/shell/controlcenter/ControlCenter.qml @@ -14,6 +14,7 @@ import "../plugins/panels/bluetooth/Model.js" as BluetoothModel import "../plugins/status" as StatusParts import "../plugins/panels/monitor" as Monitor import "../plugins/panels/network" as NetworkPanel +import "../plugins/panels/audio" as AudioPanel // The control center (SHELL-SPEC, step 2): the main view. States you flip // and the two sliders, over the same status objects the bar and the lock @@ -152,8 +153,17 @@ Item { visible: false Monitor.Panel { id: displayModule; host: pageHost; bar: pageHost; moduleName: "omarchy.monitor" } NetworkPanel.Panel { id: networkModule; host: pageHost; bar: pageHost; moduleName: "omarchy.network" } + AudioPanel.Panel { id: audioModule; host: pageHost; bar: pageHost; moduleName: "omarchy.audio" } + BluetoothStatus.Panel { id: bluetoothModule; host: pageHost; bar: pageHost; moduleName: "omarchy.bluetooth" } + Power.Panel { id: powerModule; host: pageHost; bar: pageHost; moduleName: "omarchy.power" } } - readonly property var modules: ({ "omarchy.monitor": displayModule, "omarchy.network": networkModule }) + readonly property var modules: ({ + "omarchy.monitor": displayModule, + "omarchy.network": networkModule, + "omarchy.audio": audioModule, + "omarchy.bluetooth": bluetoothModule, + "omarchy.power": powerModule + }) property var page: null // 0 on the main view, 1 on the page; the push in between. diff --git a/desktop/shell/shell/plugins/panels/audio/Panel.qml b/desktop/shell/shell/plugins/panels/audio/Panel.qml index 6c6ecaa5..30582cde 100644 --- a/desktop/shell/shell/plugins/panels/audio/Panel.qml +++ b/desktop/shell/shell/plugins/panels/audio/Panel.qml @@ -753,12 +753,15 @@ Panel { } } + // The content, for a host that shows it as a page (the control center). + readonly property Component pageContent: panel.content + KeyboardPanel { id: panel anchorItem: button owner: root bar: root.bar - open: root.opened + open: root.popupOpen focusTarget: panel.loadedContent contentWidth: panel.fittedContentWidth(Style.space(380)) contentHeight: panel.fittedContentHeight(panel.loadedContentHeight, Style.space(560)) @@ -820,13 +823,24 @@ Panel { Text { id: heroIcon textFormat: Text.PlainText - text: root.outputIcon() + // Orchard: as a control center page, the way back. + text: root.hosted ? "󰁍" : root.outputIcon() color: root.bar.foreground font.family: root.bar.fontFamily font.pixelSize: Style.font.display - opacity: root.outputMuted ? 0.5 : 1.0 + opacity: root.hosted ? 1.0 : (root.outputMuted ? 0.5 : 1.0) anchors.left: parent.left anchors.verticalCenter: parent.verticalCenter + // Pressed, it shrinks, as the control center's controls do. + scale: backPress.pressed ? 0.85 : 1 + Behavior on scale { NumberAnimation { duration: Style.duration(120); easing.type: Easing.OutCubic } } + MouseArea { + id: backPress + anchors.fill: parent + anchors.margins: -Style.space(10) + enabled: root.hosted + onClicked: root.close() + } } // Compact on/off switch on the trailing edge of the hero, and the diff --git a/desktop/shell/shell/plugins/panels/bluetooth/Panel.qml b/desktop/shell/shell/plugins/panels/bluetooth/Panel.qml index 3d8a6834..0e5b9c06 100644 --- a/desktop/shell/shell/plugins/panels/bluetooth/Panel.qml +++ b/desktop/shell/shell/plugins/panels/bluetooth/Panel.qml @@ -681,7 +681,7 @@ Panel { } ShellIpc { - target: "omarchy.bluetooth" + target: root.hosted ? "" : "omarchy.bluetooth" function open() { root.open() } function close() { root.close() } @@ -702,12 +702,15 @@ Panel { } } + // The content, for a host that shows it as a page (the control center). + readonly property Component pageContent: panel.content + KeyboardPanel { id: panel anchorItem: button owner: root bar: root.bar - open: root.opened + open: root.popupOpen focusTarget: panel.loadedContent contentWidth: panel.fittedContentWidth(Style.space(380)) contentHeight: panel.fittedContentHeight(panel.loadedContentHeight) @@ -746,11 +749,22 @@ Panel { textFormat: Text.PlainText anchors.left: parent.left anchors.verticalCenter: parent.verticalCenter - text: root.icon + // Orchard: as a control center page, the way back. + text: root.hosted ? "󰁍" : root.icon color: root.bar.foreground font.family: root.bar.fontFamily font.pixelSize: Style.font.display - opacity: root.adapter && root.adapter.enabled ? 1.0 : 0.5 + opacity: root.hosted ? 1.0 : (root.adapter && root.adapter.enabled ? 1.0 : 0.5) + // Pressed, it shrinks, as the control center's controls do. + scale: backPress.pressed ? 0.85 : 1 + Behavior on scale { NumberAnimation { duration: Style.duration(120); easing.type: Easing.OutCubic } } + MouseArea { + id: backPress + anchors.fill: parent + anchors.margins: -Style.space(10) + enabled: root.hosted + onClicked: root.close() + } } // Compact on/off switch on the trailing edge of the hero, and the diff --git a/desktop/shell/shell/plugins/panels/power/Panel.qml b/desktop/shell/shell/plugins/panels/power/Panel.qml index eb8f52f7..f571be61 100644 --- a/desktop/shell/shell/plugins/panels/power/Panel.qml +++ b/desktop/shell/shell/plugins/panels/power/Panel.qml @@ -187,7 +187,7 @@ Panel { } ShellIpc { - target: "omarchy.power" + target: root.hosted ? "" : "omarchy.power" function open() { root.open() } function close() { root.close() } @@ -305,12 +305,15 @@ Panel { } } + // The content, for a host that shows it as a page (the control center). + readonly property Component pageContent: panel.content + KeyboardPanel { id: panel anchorItem: button owner: root bar: root.bar - open: root.opened && root.batteryPresent + open: root.popupOpen && root.batteryPresent focusTarget: panel.loadedContent contentWidth: panel.fittedContentWidth(Style.space(380)) contentHeight: panel.fittedContentHeight(panel.loadedContentHeight) @@ -354,7 +357,8 @@ Panel { Text { id: heroIcon textFormat: Text.PlainText - text: root.batteryIcon() + // Orchard: as a control center page, the way back. + text: root.hosted ? "󰁍" : root.batteryIcon() color: root.bar.foreground font.family: root.bar.fontFamily font.pixelSize: Style.font.display @@ -362,6 +366,16 @@ Panel { anchors.verticalCenter: parent.verticalCenter Behavior on color { ColorAnimation { duration: Style.duration(200) } } + // Pressed, it shrinks, as the control center's controls do. + scale: backPress.pressed ? 0.85 : 1 + Behavior on scale { NumberAnimation { duration: Style.duration(120); easing.type: Easing.OutCubic } } + MouseArea { + id: backPress + anchors.fill: parent + anchors.margins: -Style.space(10) + enabled: root.hosted + onClicked: root.close() + } } Column { From 90c848c451a043ae3500e37d1bc3b92bb7e17d3c Mon Sep 17 00:00:00 2001 From: Henrik Klee Date: Fri, 20 Nov 2026 02:33:20 +0800 Subject: [PATCH 14/32] Bar: upstream's size again The tablet port held the bar at 38 points with 40-point icon slots so a finger could hit its icons. A finger now has the control center (pulled down, or its button) and the launcher, so the bar is upstream's again: 26 points, upstream's icon slots and glyph sizes; Style.qml is upstream's unchanged. Assisted-by: LLM --- desktop/shell/shell/Commons/Style.qml | 13 ++++++------- docs/upstream.md | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/desktop/shell/shell/Commons/Style.qml b/desktop/shell/shell/Commons/Style.qml index 3afb2d47..6016cce4 100644 --- a/desktop/shell/shell/Commons/Style.qml +++ b/desktop/shell/shell/Commons/Style.qml @@ -341,8 +341,7 @@ QtObject { } readonly property QtObject bar: QtObject { - // Tablet port: a larger top-bar target without scaling menus or theme text. - readonly property int sizeHorizontal: Math.max(38, root.barToken("size-horizontal", 26)) + readonly property int sizeHorizontal: root.barToken("size-horizontal", 26) readonly property int sizeVertical: root.barToken("size-vertical", 28) // Calibrated notch cutout height in logical px, for panels whose real // cutout differs from the derived default (see BarModel.notchHeight). @@ -351,11 +350,11 @@ QtObject { var v = Number(root.barOverrides["notch-height"]) return (isFinite(v) && v > 0) ? Math.round(v) : 0 } - readonly property int iconSlot: Math.max(40, root.barToken("icon-slot", 27)) - readonly property int iconCanvas: Math.max(22, root.barToken("icon-canvas", 16)) - readonly property int iconFont: Math.max(19, root.barToken("icon-font", 13)) - readonly property int iconSize: Math.min(iconCanvas, Math.max(18, root.barToken("icon-size", 12))) - readonly property int statusSlot: Math.max(28, root.barToken("status-slot", 21)) + readonly property int iconSlot: root.barToken("icon-slot", 27) + readonly property int iconCanvas: root.barToken("icon-canvas", 16) + readonly property int iconFont: root.barToken("icon-font", 13) + readonly property int iconSize: Math.min(iconCanvas, root.barToken("icon-size", 12)) + readonly property int statusSlot: root.barToken("status-slot", 21) } // Off with Hyprland's own animations, as `omarchy toggle animations` turns diff --git a/docs/upstream.md b/docs/upstream.md index b28b9ebf..184778f8 100644 --- a/docs/upstream.md +++ b/docs/upstream.md @@ -72,7 +72,7 @@ boot cover or theme intro videos, software decode at panel size, no startup signal of its own when the session starts locked), the lock (taken at session start, lifting Labwc's startup cover; `plugins/lock/Service.qml`), wallpaper readiness (`LockView.qml`), -`Style.qml` (a larger bar target), `config/omarchy/shell.json` (the tablet's bar +`config/omarchy/shell.json` (the tablet's bar and the plugins it turns off). **Menu.** `default/omarchy/omarchy-menu.jsonc`: Activity opens Omactivity, Setup > Monitors opens the Display panel, Maximize From e05d886fb8fa5e572fe861f282abc950b89159de Mon Sep 17 00:00:00 2001 From: Henrik Klee Date: Fri, 20 Nov 2026 03:22:59 +0800 Subject: [PATCH 15/32] Launcher: the bar stays the bar; it gives way to popups The launcher does not dim the bar, so its strip is no longer part of the launcher's input: a click there reaches the bar's own item instead of only closing the launcher, and a bar popup opening (or the control center) puts the launcher away. The control center's card also counts a popup's fade as moving, drawn from a texture then. Assisted-by: LLM --- .../shell/controlcenter/ControlCenter.qml | 5 +++-- desktop/shell/shell/launcher/Launcher.qml | 21 ++++++++++++++----- desktop/shell/shell/shell.qml | 1 + 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/desktop/shell/shell/controlcenter/ControlCenter.qml b/desktop/shell/shell/controlcenter/ControlCenter.qml index 1b2fe23c..a2619614 100644 --- a/desktop/shell/shell/controlcenter/ControlCenter.qml +++ b/desktop/shell/shell/controlcenter/ControlCenter.qml @@ -320,6 +320,7 @@ Item { } function show() { root.closePopout() + if (root.shell && root.shell.launcher && root.shell.launcher.opened) root.shell.launcher.close() root.prepare() root.opened = true root.mapped = true @@ -451,8 +452,8 @@ Item { } } - // Moving: the spring or a finger. - readonly property bool moving: spring.running || root.pulling + // Moving: the spring, a finger, or a popup's fade. + readonly property bool moving: spring.running || root.pulling || popupIn.running || popupOut.running // While open, a note for the Home button (omarchy-home-button closes it). readonly property string openNote: (Quickshell.env("XDG_RUNTIME_DIR") || "/tmp") + "/omarchy-control-center-open" diff --git a/desktop/shell/shell/launcher/Launcher.qml b/desktop/shell/shell/launcher/Launcher.qml index 044cc53a..6e798059 100644 --- a/desktop/shell/shell/launcher/Launcher.qml +++ b/desktop/shell/shell/launcher/Launcher.qml @@ -687,6 +687,14 @@ Item { else root.open() } + // A bar item's popup opening puts the launcher away. + Connections { + target: root.shell ? root.shell.bar : null + function onActivePopoutChanged() { + if (root.opened && root.shell.bar.activePopout) root.close() + } + } + function rebuild() { root.appsStale = false var rows = root.appLibrary ? root.appLibrary.sortedEntries("") : [] @@ -986,12 +994,15 @@ LC_ALL=C pacman -Qi omarchy-a 2>/dev/null | awk \'/^Depends On/ { on = 1 } /^Opt } } - // The bar's strip closes the launcher, as the bar's logo would. - MouseArea { + // The bar is not dimmed, so it stays the bar: its strip is outside + // the launcher's input, and a click there reaches the bar's own item (a + // popup it opens puts the launcher away, see below). + mask: Region { item: launcherInput } + Item { + id: launcherInput + y: root.barInset width: parent.width - height: root.barInset - acceptedButtons: Qt.LeftButton | Qt.RightButton - onClicked: root.close() + height: Math.max(0, parent.height - root.barInset) } // Anywhere else that nothing takes: put search away, never close. diff --git a/desktop/shell/shell/shell.qml b/desktop/shell/shell/shell.qml index 64be7023..4235da59 100644 --- a/desktop/shell/shell/shell.qml +++ b/desktop/shell/shell/shell.qml @@ -33,6 +33,7 @@ ShellRoot { ControlCenter { id: controlCenter; shell: shell } // The bar pulls it down from the top edge's right third (Bar.qml). readonly property var controlCenter: controlCenter + readonly property var launcher: appGrid ShellIpc { target: "omarchy.dock" function apps(): void { appGrid.toggle() } From dc547acfb903e5100a85f8de462cfa65dc0d4f8e Mon Sep 17 00:00:00 2001 From: Henrik Klee Date: Fri, 20 Nov 2026 03:25:29 +0800 Subject: [PATCH 16/32] Control center: as a popup, one of the bar's popups Opened from its button, the control center registers with the bar as its open popup: the bar draws its mark under the button, and another item's popup (or the bar's switching) closes it through the button's close(). Its window leaves the bar strip out of its input then, so a click on another item reaches it. Pulled down or opened from the keyboard it still takes the whole screen. Assisted-by: LLM --- desktop/shell/shell/controlcenter/ControlCenter.qml | 11 +++++++++++ .../shell/plugins/control-center/BarWidget.qml | 13 +++++++++++++ 2 files changed, 24 insertions(+) diff --git a/desktop/shell/shell/controlcenter/ControlCenter.qml b/desktop/shell/shell/controlcenter/ControlCenter.qml index a2619614..acc54451 100644 --- a/desktop/shell/shell/controlcenter/ControlCenter.qml +++ b/desktop/shell/shell/controlcenter/ControlCenter.qml @@ -474,6 +474,17 @@ Item { id: panel shown: root.mapped WlrLayershell.namespace: "omarchy-control-center" + // As a popup it leaves the bar to the bar: a click on another item there + // reaches it (and its popup closes this one). Pulled down or opened from + // the keyboard, it takes the whole screen. + mask: root.popupStyle ? popupInput : null + Region { id: popupInput; item: popupInputArea } + Item { + id: popupInputArea + y: root.barInset + width: parent.width + height: Math.max(0, parent.height - root.barInset) + } onContentRevealedChanged: if (contentRevealed && root.opened && !root.pulling) { root.reveal = 0 diff --git a/desktop/shell/shell/plugins/control-center/BarWidget.qml b/desktop/shell/shell/plugins/control-center/BarWidget.qml index 25d47da2..dd704ad4 100644 --- a/desktop/shell/shell/plugins/control-center/BarWidget.qml +++ b/desktop/shell/shell/plugins/control-center/BarWidget.qml @@ -14,6 +14,19 @@ BarWidget { readonly property var center: root.bar && root.bar.shell ? root.bar.shell.controlCenter : null + // Open as a popup, it is the bar's open popup like any other: the bar + // draws its mark under this button, and another item's popup opening (or + // the bar's switching between them) closes it through close(). + readonly property bool popupShown: !!root.center && root.center.opened && root.center.popupStyle + onPopupShownChanged: { + if (!root.bar) return + if (root.popupShown) root.bar.requestPopout(root) + else root.bar.releasePopout(root) + } + function open() { if (root.center && !root.center.opened) root.center.togglePopup() } + function close() { if (root.center && root.center.opened) root.center.close() } + function closeForPopoutSwitch() { root.close() } + BarIconButton { id: button anchors.fill: parent From 55510961939656b37c94d4ef6b0874610fc09f57 Mon Sep 17 00:00:00 2001 From: Henrik Klee Date: Fri, 20 Nov 2026 03:28:39 +0800 Subject: [PATCH 17/32] Control center: cheap on software rendering; the bar knows its card - On Qt's software renderer the pull only moves the card (its bottom still under the finger): no scaling, fading or layer for the CPU to redraw every frame, the screen dims in one step, and the popup opens and closes at once, as the launcher does there. - Open as a popup it notes its card with the bar, as KeyboardPanel does, so a popup taking over in the same section morphs from it rather than from an older card. Assisted-by: LLM --- .../shell/controlcenter/ControlCenter.qml | 37 +++++++++++++++---- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/desktop/shell/shell/controlcenter/ControlCenter.qml b/desktop/shell/shell/controlcenter/ControlCenter.qml index acc54451..79d1d679 100644 --- a/desktop/shell/shell/controlcenter/ControlCenter.qml +++ b/desktop/shell/shell/controlcenter/ControlCenter.qml @@ -354,14 +354,15 @@ Item { NumberAnimation { id: popupIn target: root; property: "reveal"; to: 1 - duration: Style.duration(180) + // Software rendering: at once, as the launcher does there. + duration: root.gpu ? Style.duration(180) : 0 easing.type: Easing.Bezier easing.bezierCurve: Style.easeOut } NumberAnimation { id: popupOut target: root; property: "reveal"; to: 0 - duration: Style.duration(120) + duration: root.gpu ? Style.duration(120) : 0 easing.type: Easing.Bezier easing.bezierCurve: Style.easeOut onFinished: if (!root.opened) { root.mapped = false; root.dropPage() } @@ -452,12 +453,30 @@ Item { } } + // Open as a popup, the bar knows its card as it knows its other popups' + // (KeyboardPanel notes them): a popup taking over in the same section + // morphs from this card, not from an older one. + function notePopupCard() { + var bar = root.shell ? root.shell.bar : null + if (!root.popupStyle || !root.opened || !bar || typeof bar.notePopoutCard !== "function") return + bar.notePopoutCard({ screen: panel.screen ? panel.screen.name : "", x: card.x, y: card.y, + width: card.width, height: card.height }) + } + onPopupStyleChanged: Qt.callLater(notePopupCard) + Connections { + target: card + function onHeightChanged() { root.notePopupCard() } + } + // Moving: the spring, a finger, or a popup's fade. readonly property bool moving: spring.running || root.pulling || popupIn.running || popupOut.running // While open, a note for the Home button (omarchy-home-button closes it). readonly property string openNote: (Quickshell.env("XDG_RUNTIME_DIR") || "/tmp") + "/omarchy-control-center-open" - onOpenedChanged: Quickshell.execDetached(opened ? ["touch", openNote] : ["rm", "-f", openNote]) + onOpenedChanged: { + Quickshell.execDetached(opened ? ["touch", openNote] : ["rm", "-f", openNote]) + Qt.callLater(notePopupCard) + } ShellIpc { target: "omarchy.controlcenter" @@ -500,7 +519,9 @@ Item { width: parent.width height: parent.height - y color: root.phone ? Commons.Color.menu.background : Commons.Color.menu.scrim - opacity: root.popupStyle ? 0 : Math.max(0, Math.min(1, root.reveal)) + // Software rendering dims in one step rather than blending the whole + // screen again on every frame of a pull. + opacity: root.popupStyle ? 0 : (root.gpu ? Math.max(0, Math.min(1, root.reveal)) : (root.reveal > 0 ? 1 : 0)) MouseArea { anchors.fill: parent acceptedButtons: Qt.LeftButton | Qt.RightButton @@ -586,7 +607,7 @@ Item { id: card // While it moves, drawn once into a texture that is only scaled, moved // and faded (cheap on any GPU); at rest drawn directly, sharp. - layer.enabled: root.moving + layer.enabled: root.moving && root.gpu layer.smooth: true x: root.phone ? 0 : parent.width - width - Style.gapsOut y: root.phone ? root.barInset : root.barInset + Style.gapsOut @@ -605,7 +626,9 @@ Item { // down as a share of the card's bottom. On the way it grows out of its // own top centre and fades in; the slide is what keeps the scaled bottom under the finger. // As a popup: it grows from 97 % toward its button and fades. - readonly property real grow: root.popupStyle ? 0.97 + 0.03 * root.reveal : 0.86 + 0.14 * root.reveal + // Software rendering only moves it (its bottom still under the finger): + // no scaling or fading for the CPU to redraw each frame. + readonly property real grow: !root.gpu ? 1 : (root.popupStyle ? 0.97 + 0.03 * root.reveal : 0.86 + 0.14 * root.reveal) transform: [ Scale { origin.x: root.popupStyle ? card.width : card.width / 2 @@ -619,7 +642,7 @@ Item { // once. Going out (let go to close, or pushed up from open): it fades // with its way up, gone as its bottom edge reaches the status bar. readonly property real barShare: Math.min(0.9, root.barInset / root.pullSpan) - opacity: root.popupStyle ? root.reveal : root.leaving + opacity: !root.gpu ? (root.reveal > 0 ? 1 : 0) : root.popupStyle ? root.reveal : root.leaving ? Math.max(0, Math.min(1, (root.reveal - barShare) / (1 - barShare))) : 1 - Math.pow(1 - Math.max(0, Math.min(1, root.reveal / 0.25)), 2) From f2b2f3a53bc4a5e8d42c466fb383abd599c74fd9 Mon Sep 17 00:00:00 2001 From: Henrik Klee Date: Fri, 20 Nov 2026 03:36:51 +0800 Subject: [PATCH 18/32] Bar: a phone's bar is logo and time, then the status MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The shell spec's iPhone bar: the logo and the time together on the left, no date, the status icons on the right (Stay Awake while on, network, battery), and no overflow pages behind a "…" button. A new narrow value, "hidden", leaves Audio, Bluetooth, Display and the control center button off a narrow bar altogether; a phone reaches them through the control center. `narrow: false` and its overflow pages still work for a layout that asks for them. A migration moves existing users' layouts the same way where an entry still has the setting the package gave it. Assisted-by: LLM --- desktop/shell/config/omarchy/shell.json | 14 ++--- desktop/shell/migrations/1795116913.sh | 47 +++++++++++++++++ desktop/shell/shell/plugins/bar/BarModel.js | 7 ++- tests/test_bar_layout.py | 58 ++++++++++----------- 4 files changed, 87 insertions(+), 39 deletions(-) create mode 100644 desktop/shell/migrations/1795116913.sh diff --git a/desktop/shell/config/omarchy/shell.json b/desktop/shell/config/omarchy/shell.json index a92a65e3..93d743df 100644 --- a/desktop/shell/config/omarchy/shell.json +++ b/desktop/shell/config/omarchy/shell.json @@ -7,16 +7,16 @@ "layout": { "left": [{ "id": "omarchy.menu" }], "centerBegin": [], - "center": [{ "id": "omarchy.clock", "format": "HH:mm" }], + "center": [{ "id": "omarchy.clock", "format": "HH:mm", "narrow": "left" }], "centerEnd": [], "right": [ - { "id": "omarchy.indicators", "items": ["StayAwake"], "narrow": "left" }, - { "id": "omarchy.audio", "narrow": false }, - { "id": "omarchy.bluetooth", "narrow": false }, - { "id": "omarchy.network", "narrow": "left" }, - { "id": "omarchy.monitor", "narrow": false }, + { "id": "omarchy.indicators", "items": ["StayAwake"] }, + { "id": "omarchy.audio", "narrow": "hidden" }, + { "id": "omarchy.bluetooth", "narrow": "hidden" }, + { "id": "omarchy.network" }, + { "id": "omarchy.monitor", "narrow": "hidden" }, { "id": "omarchy.power" }, - { "id": "ipadlinux.controlcenter", "narrow": false } + { "id": "ipadlinux.controlcenter", "narrow": "hidden" } ] } }, diff --git a/desktop/shell/migrations/1795116913.sh b/desktop/shell/migrations/1795116913.sh new file mode 100644 index 00000000..ada93d5e --- /dev/null +++ b/desktop/shell/migrations/1795116913.sh @@ -0,0 +1,47 @@ +echo "A phone's bar: logo and time on the left, status icons on the right" + +# On a phone (a narrow bar) the clock joins the logo, and Audio, Bluetooth, +# Display and the control center's button leave the bar for the control +# center ("hidden"), with no overflow pages. A user's own layout +# (~/.config/omarchy-ipad/shell.json) changes only where an entry still has +# the setting the package gave it. +config="$HOME/.config/omarchy-ipad/shell.json" +[[ -f $config ]] || exit 0 +python3 - "$config" <<'PY' +import json, os, sys +path = sys.argv[1] +with open(path) as f: + config = json.load(f) +layout = config.get("bar", {}).get("layout", {}) +missing = object() +# id: (the package's old setting, the new one); missing = no setting. +changes = { + "omarchy.clock": (missing, "left"), + "omarchy.indicators": ("left", missing), + "omarchy.audio": (False, "hidden"), + "omarchy.bluetooth": (False, "hidden"), + "omarchy.network": ("left", missing), + "omarchy.monitor": (False, "hidden"), + "ipadlinux.controlcenter": (False, "hidden"), +} +changed = False +for section in layout.values(): + if not isinstance(section, list): + continue + for entry in section: + if not isinstance(entry, dict) or entry.get("id") not in changes: + continue + old, new = changes[entry["id"]] + if entry.get("narrow", missing) is not old and entry.get("narrow", missing) != old: + continue + if new is missing: + entry.pop("narrow", None) + else: + entry["narrow"] = new + changed = True +if changed: + with open(path + ".new", "w") as f: + json.dump(config, f, indent=2) + f.write("\n") + os.replace(path + ".new", path) +PY diff --git a/desktop/shell/shell/plugins/bar/BarModel.js b/desktop/shell/shell/plugins/bar/BarModel.js index cdc1493c..a36410c8 100644 --- a/desktop/shell/shell/plugins/bar/BarModel.js +++ b/desktop/shell/shell/plugins/bar/BarModel.js @@ -396,7 +396,9 @@ function layoutWidgets(layout, memo) { // widgets of a tablet's bar run into the clock. It is made from the one layout // in shell.json by each entry's `narrow` setting: false takes the widget // off the first page, a section's name moves it to the end of that section, -// and an entry without the setting stays where it is. The entries themselves +// "hidden" leaves it out of a narrow bar altogether (Orchard: a phone reaches +// it through the control center instead), and an entry without the setting +// stays where it is. The entries themselves // are passed on untouched, so a widget keeps its settings in either layout. // // No widget is dropped for good: when some are off the first page, the right @@ -417,6 +419,7 @@ function narrowOverflow(layout) { var list = Array.isArray(source[sections[r]]) ? source[sections[r]] : [] for (var i = 0; i < list.length; i++) { var hint = isPlainObject(list[i]) ? list[i].narrow : undefined + if (hint === "hidden") continue if (hint === false) held.push(list[i]) else if (sections[r] === "left" && (hint === undefined || hint === "left")) ownLeft++ } @@ -454,7 +457,7 @@ function narrowLayout(layout, page) { var list = Array.isArray(source[sections[r]]) ? source[sections[r]] : [] for (var i = 0; i < list.length; i++) { var hint = isPlainObject(list[i]) ? list[i].narrow : undefined - if (hint === false) continue + if (hint === false || hint === "hidden") continue var target = sections.indexOf(hint) !== -1 ? hint : sections[r] if (shown > 0 && (target === "right" || (target === "left" && target !== sections[r]))) continue out[target].push(list[i]) diff --git a/tests/test_bar_layout.py b/tests/test_bar_layout.py index 21aa156c..e588461f 100644 --- a/tests/test_bar_layout.py +++ b/tests/test_bar_layout.py @@ -17,55 +17,53 @@ def node(self, script, *args): return result.stdout @unittest.skipUnless(shutil.which('node'), 'node is required for bar model validation') - def test_a_phone_bar_fits_beside_the_clock(self): + def test_a_phones_bar_is_logo_and_time_then_status(self): narrow = json.loads(self.node(r''' const model = require(process.argv[1]); const layout = JSON.parse(require('node:fs').readFileSync(process.argv[2], 'utf8')).bar.layout; const before = JSON.stringify(layout); const narrow = model.narrowLayout(layout); if (JSON.stringify(layout) !== before) throw new Error('the configured layout was changed'); -console.log(JSON.stringify(narrow)); +console.log(JSON.stringify({narrow, pages: model.narrowPages(layout)})); ''', BAR / 'BarModel.js', CONFIG)) - ids = {section: [entry['id'] for entry in entries] for section, entries in narrow.items()} - self.assertEqual(ids['left'], ['omarchy.menu', 'omarchy.indicators', 'omarchy.network']) - self.assertEqual(ids['center'], ['omarchy.clock']) - self.assertEqual(ids['right'], ['omarchy.power', 'omarchy.overflow']) - # Touch slots are 40 px, the battery with its percentage two of them, and - # beside a centered clock a 375 px bar has room for three a side. - slots = lambda section: sum(2 if name == 'omarchy.power' else 1 for name in ids[section]) - self.assertLessEqual(slots('left'), 3) - self.assertLessEqual(slots('right'), 3) + ids = {section: [entry['id'] for entry in entries] for section, entries in narrow['narrow'].items()} + # The logo and the time together on the left, the status on the right + # (SHELL-SPEC), and no overflow pages. + self.assertEqual(ids['left'], ['omarchy.menu', 'omarchy.clock']) + self.assertEqual(ids['center'], []) + self.assertEqual(ids['right'], ['omarchy.indicators', 'omarchy.network', 'omarchy.power']) + self.assertEqual(narrow['pages'], 1) + # What a phone's bar leaves out, it reaches through the control center. + configured = [entry for entries in json.loads(CONFIG.read_text())['bar']['layout'].values() for entry in entries] + hidden = {entry['id'] for entry in configured if entry.get('narrow') == 'hidden'} + self.assertEqual(hidden, {'omarchy.audio', 'omarchy.bluetooth', 'omarchy.monitor', 'ipadlinux.controlcenter'}) @unittest.skipUnless(shutil.which('node'), 'node is required for bar model validation') - def test_a_narrow_bar_drops_no_widget(self): - # What does not fit beside the clock is one press of the overflow widget - # away, and the press after the last page is the first page again. + def test_a_narrow_bar_drops_no_widget_it_was_not_told_to(self): + # A widget set to `narrow: false` is one press of the overflow widget + # away, and the press after the last page is the first page again; + # only "hidden" leaves a widget out of a narrow bar. pages = json.loads(self.node(r""" const model = require(process.argv[1]); -const layout = JSON.parse(require('node:fs').readFileSync(process.argv[2], 'utf8')).bar.layout; +const layout = {left: [{id: 'menu'}], center: [{id: 'clock'}], + right: [{id: 'a', narrow: false}, {id: 'b', narrow: false}, {id: 'c', narrow: 'hidden'}, {id: 'power'}]}; const ids = page => Object.fromEntries(Object.entries(model.narrowLayout(layout, page)) .map(([section, entries]) => [section, entries.map(entry => entry.id)])); const count = model.narrowPages(layout); console.log(JSON.stringify({count, pages: [...Array(count + 1).keys()].map(ids), - monitor: model.narrowPageOf(layout, 'omarchy.monitor'), power: model.narrowPageOf(layout, 'omarchy.power'), - none: model.narrowPageOf(layout, 'omarchy.absent'), - plain: model.narrowLayout({left: [{id: 'a'}], right: [{id: 'b'}]}).right.map(entry => entry.id)})); -""", BAR / 'BarModel.js', CONFIG)) - configured = [entry['id'] for entries in json.loads(CONFIG.read_text())['bar']['layout'].values() - for entry in entries] + a: model.narrowPageOf(layout, 'a'), power: model.narrowPageOf(layout, 'power'), + none: model.narrowPageOf(layout, 'absent'), + plain: model.narrowLayout({left: [{id: 'x'}], right: [{id: 'y'}]}).right.map(entry => entry.id)})); +""", BAR / 'BarModel.js')) shown = {name for page in pages['pages'] for entries in page.values() for name in entries} - self.assertEqual(shown - {'omarchy.overflow'}, set(configured)) + self.assertEqual(shown - {'omarchy.overflow'}, {'menu', 'clock', 'a', 'b', 'power'}) self.assertEqual(pages['count'], 2) - second = pages['pages'][1] - self.assertEqual(second['left'], ['omarchy.menu', 'omarchy.audio', 'omarchy.bluetooth']) - self.assertEqual(second['center'], ['omarchy.clock']) - self.assertEqual(second['right'], ['omarchy.monitor', 'ipadlinux.controlcenter', 'omarchy.overflow']) - # Three 40 px touch slots a side, as on the first page. - self.assertTrue(all(len(page[side]) <= 3 for page in pages['pages'] for side in ('left', 'right'))) + self.assertEqual(pages['pages'][0]['right'], ['power', 'omarchy.overflow']) + self.assertEqual(pages['pages'][1]['left'], ['menu', 'a', 'b']) self.assertEqual(pages['pages'][2], pages['pages'][0]) - self.assertEqual((pages['monitor'], pages['power'], pages['none']), (1, 0, -1)) + self.assertEqual((pages['a'], pages['power'], pages['none']), (1, 0, -1)) # A layout with nothing taken off has no overflow widget. - self.assertEqual(pages['plain'], ['b']) + self.assertEqual(pages['plain'], ['y']) manifest = json.loads((BAR / 'widgets/Overflow.manifest.json').read_text()) self.assertEqual(manifest['id'], 'omarchy.overflow') self.assertTrue((BAR / 'widgets' / manifest['entryPoints']['barWidget']).is_file()) From d64755947d58932038b82e38deeab325b91d63ad Mon Sep 17 00:00:00 2001 From: Henrik Klee Date: Fri, 20 Nov 2026 03:37:30 +0800 Subject: [PATCH 19/32] Bar: every icon stays on a phone's bar for now Audio, Bluetooth, Display and the control center button stay on a phone's bar, beside the status, with the logo and time on the left. The "hidden" narrow value stays for a layout that wants a slimmer phone bar. Assisted-by: LLM --- desktop/shell/config/omarchy/shell.json | 8 ++++---- desktop/shell/migrations/1795116913.sh | 13 ++++++------- tests/test_bar_layout.py | 8 ++++---- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/desktop/shell/config/omarchy/shell.json b/desktop/shell/config/omarchy/shell.json index 93d743df..4f5dc7b9 100644 --- a/desktop/shell/config/omarchy/shell.json +++ b/desktop/shell/config/omarchy/shell.json @@ -11,12 +11,12 @@ "centerEnd": [], "right": [ { "id": "omarchy.indicators", "items": ["StayAwake"] }, - { "id": "omarchy.audio", "narrow": "hidden" }, - { "id": "omarchy.bluetooth", "narrow": "hidden" }, + { "id": "omarchy.audio" }, + { "id": "omarchy.bluetooth" }, { "id": "omarchy.network" }, - { "id": "omarchy.monitor", "narrow": "hidden" }, + { "id": "omarchy.monitor" }, { "id": "omarchy.power" }, - { "id": "ipadlinux.controlcenter", "narrow": "hidden" } + { "id": "ipadlinux.controlcenter" } ] } }, diff --git a/desktop/shell/migrations/1795116913.sh b/desktop/shell/migrations/1795116913.sh index ada93d5e..d82f8f57 100644 --- a/desktop/shell/migrations/1795116913.sh +++ b/desktop/shell/migrations/1795116913.sh @@ -1,8 +1,7 @@ echo "A phone's bar: logo and time on the left, status icons on the right" -# On a phone (a narrow bar) the clock joins the logo, and Audio, Bluetooth, -# Display and the control center's button leave the bar for the control -# center ("hidden"), with no overflow pages. A user's own layout +# On a phone (a narrow bar) the clock joins the logo and every icon stays on +# the bar, with no overflow pages. A user's own layout # (~/.config/omarchy-ipad/shell.json) changes only where an entry still has # the setting the package gave it. config="$HOME/.config/omarchy-ipad/shell.json" @@ -18,11 +17,11 @@ missing = object() changes = { "omarchy.clock": (missing, "left"), "omarchy.indicators": ("left", missing), - "omarchy.audio": (False, "hidden"), - "omarchy.bluetooth": (False, "hidden"), + "omarchy.audio": (False, missing), + "omarchy.bluetooth": (False, missing), "omarchy.network": ("left", missing), - "omarchy.monitor": (False, "hidden"), - "ipadlinux.controlcenter": (False, "hidden"), + "omarchy.monitor": (False, missing), + "ipadlinux.controlcenter": (False, missing), } changed = False for section in layout.values(): diff --git a/tests/test_bar_layout.py b/tests/test_bar_layout.py index e588461f..0e2d8c65 100644 --- a/tests/test_bar_layout.py +++ b/tests/test_bar_layout.py @@ -31,12 +31,12 @@ def test_a_phones_bar_is_logo_and_time_then_status(self): # (SHELL-SPEC), and no overflow pages. self.assertEqual(ids['left'], ['omarchy.menu', 'omarchy.clock']) self.assertEqual(ids['center'], []) - self.assertEqual(ids['right'], ['omarchy.indicators', 'omarchy.network', 'omarchy.power']) + self.assertEqual(ids['right'], ['omarchy.indicators', 'omarchy.audio', 'omarchy.bluetooth', 'omarchy.network', + 'omarchy.monitor', 'omarchy.power', 'ipadlinux.controlcenter']) self.assertEqual(narrow['pages'], 1) - # What a phone's bar leaves out, it reaches through the control center. + # Every icon stays on a phone's bar for now: nothing is hidden there. configured = [entry for entries in json.loads(CONFIG.read_text())['bar']['layout'].values() for entry in entries] - hidden = {entry['id'] for entry in configured if entry.get('narrow') == 'hidden'} - self.assertEqual(hidden, {'omarchy.audio', 'omarchy.bluetooth', 'omarchy.monitor', 'ipadlinux.controlcenter'}) + self.assertFalse([entry['id'] for entry in configured if entry.get('narrow') == 'hidden']) @unittest.skipUnless(shutil.which('node'), 'node is required for bar model validation') def test_a_narrow_bar_drops_no_widget_it_was_not_told_to(self): From 8313f98d37718101e43e2b352382b2bfa745de04 Mon Sep 17 00:00:00 2001 From: Henrik Klee Date: Fri, 20 Nov 2026 03:40:17 +0800 Subject: [PATCH 20/32] Control center: a phone's bar stays clickable above it On a phone the status bar shows above the control center, so the bar strip is left out of its input there too (as for the popup): a tap on a bar item reaches it. A bar item's popup opening closes the control center, as it does the launcher. Assisted-by: LLM --- .../shell/controlcenter/ControlCenter.qml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/desktop/shell/shell/controlcenter/ControlCenter.qml b/desktop/shell/shell/controlcenter/ControlCenter.qml index 79d1d679..cf7a1b55 100644 --- a/desktop/shell/shell/controlcenter/ControlCenter.qml +++ b/desktop/shell/shell/controlcenter/ControlCenter.qml @@ -318,6 +318,16 @@ Item { root.popupStyle = false root.show() } + // A bar item's popup opening puts the control center away (its own + // button's registration aside). + Connections { + target: root.shell ? root.shell.bar : null + function onActivePopoutChanged() { + var popout = root.shell.bar.activePopout + if (root.opened && popout && popout.moduleName !== "ipadlinux.controlcenter") root.close() + } + } + function show() { root.closePopout() if (root.shell && root.shell.launcher && root.shell.launcher.opened) root.shell.launcher.close() @@ -493,10 +503,10 @@ Item { id: panel shown: root.mapped WlrLayershell.namespace: "omarchy-control-center" - // As a popup it leaves the bar to the bar: a click on another item there - // reaches it (and its popup closes this one). Pulled down or opened from - // the keyboard, it takes the whole screen. - mask: root.popupStyle ? popupInput : null + // Where the bar shows above it (as a popup, and always on a phone) the + // bar stays the bar: a click on an item there reaches it, and its popup + // closes this one. Pulled down on an iPad, it dims and takes the screen. + mask: root.popupStyle || root.phone ? popupInput : null Region { id: popupInput; item: popupInputArea } Item { id: popupInputArea From fc2aa8c019c0ad6e157ceafdb9fad6f294453bca Mon Sep 17 00:00:00 2001 From: Henrik Klee Date: Fri, 20 Nov 2026 03:41:04 +0800 Subject: [PATCH 21/32] Launcher: opening it closes bar popups and the control center The launcher is never shown over a bar popup or the control center: it closes the bar's open popup and the control center first. Assisted-by: LLM --- desktop/shell/shell/launcher/Launcher.qml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/desktop/shell/shell/launcher/Launcher.qml b/desktop/shell/shell/launcher/Launcher.qml index 6e798059..559889b1 100644 --- a/desktop/shell/shell/launcher/Launcher.qml +++ b/desktop/shell/shell/launcher/Launcher.qml @@ -650,6 +650,11 @@ Item { } function open() { + // A bar popup, or the control center, goes first: the launcher is never + // shown over one. + var bar = root.shell ? root.shell.bar : null + if (bar && bar.activePopout && typeof bar.activePopout.close === "function") bar.activePopout.close() + if (root.shell && root.shell.controlCenter && root.shell.controlCenter.opened) root.shell.controlCenter.close() if (root.appLibrary) root.appLibrary.refreshIcons() if (root.appsStale || root.apps.length === 0) root.rebuild() // Stop Screenrecording and the session list follow what is true now. From 92d4e9c5490bef55797c51523dac6292e5b74e8f Mon Sep 17 00:00:00 2001 From: Henrik Klee Date: Fri, 20 Nov 2026 03:43:25 +0800 Subject: [PATCH 22/32] Control center: its Home note can no longer be left behind The note telling omarchy-home-button that the control center is open was written by two detached commands (touch, rm) that could finish out of order, and a shell restarted while it was open left it too. With the note stale, every Home press only "closed" the control center and opened nothing. One writer now runs again until the note matches, and a note from an earlier shell goes at start. Assisted-by: LLM --- .../shell/controlcenter/ControlCenter.qml | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/desktop/shell/shell/controlcenter/ControlCenter.qml b/desktop/shell/shell/controlcenter/ControlCenter.qml index cf7a1b55..e6141f82 100644 --- a/desktop/shell/shell/controlcenter/ControlCenter.qml +++ b/desktop/shell/shell/controlcenter/ControlCenter.qml @@ -483,8 +483,28 @@ Item { // While open, a note for the Home button (omarchy-home-button closes it). readonly property string openNote: (Quickshell.env("XDG_RUNTIME_DIR") || "/tmp") + "/omarchy-control-center-open" + // One writer, run again until the note matches: two detached commands could + // finish out of order and leave the note behind a closed control center, + // and Home would then only ever "close" it. A note left from an earlier + // shell goes at start. + property bool noteWritten: true + function writeOpenNote() { + if (noteWriter.running || root.noteWritten === root.opened) return + noteWriter.writing = root.opened + noteWriter.command = root.opened ? ["touch", root.openNote] : ["rm", "-f", root.openNote] + noteWriter.running = true + } + Process { + id: noteWriter + property bool writing: false + onExited: { + root.noteWritten = writing + root.writeOpenNote() + } + } + Component.onCompleted: writeOpenNote() onOpenedChanged: { - Quickshell.execDetached(opened ? ["touch", openNote] : ["rm", "-f", openNote]) + writeOpenNote() Qt.callLater(notePopupCard) } From 86c2bc026aad528b75b6a6d9546a27c4e08b59bd Mon Sep 17 00:00:00 2001 From: Henrik Klee Date: Fri, 20 Nov 2026 03:45:28 +0800 Subject: [PATCH 23/32] Control center: on a phone the finger holds the content's bottom On a phone the card is the whole screen, so the finger held the bottom of an empty sheet and the tiles came in far above it. The finger now holds the bottom of the content (or of the open page), and the empty sheet below comes in under the thumb. Assisted-by: LLM --- desktop/shell/shell/controlcenter/ControlCenter.qml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/desktop/shell/shell/controlcenter/ControlCenter.qml b/desktop/shell/shell/controlcenter/ControlCenter.qml index e6141f82..1a16acf6 100644 --- a/desktop/shell/shell/controlcenter/ControlCenter.qml +++ b/desktop/shell/shell/controlcenter/ControlCenter.qml @@ -385,7 +385,7 @@ Item { property bool pulling: false // A long press opened a page while the finger is still down (see above). property bool touchSpent: false - readonly property real pullSpan: Math.max(1, card.y + card.height) + readonly property real pullSpan: Math.max(1, card.y + card.follow) property real pullFrom: 0 function beginPull() { @@ -645,7 +645,12 @@ Item { // The main view's height, the page's, and the push between them. readonly property real mainHeight: content.implicitHeight + root.pad * 2 readonly property real pageHeight: pageView.implicitHeight + root.pad * 2 - height: root.phone ? parent.height - root.barInset : mainHeight + (pageHeight - mainHeight) * root.pageShift + readonly property real contentHeight: mainHeight + (pageHeight - mainHeight) * root.pageShift + height: root.phone ? parent.height - root.barInset : contentHeight + // What the finger holds: the card's bottom, or on a phone (where the + // card is the screen) the bottom of its content; the empty sheet below + // comes in under the thumb. + readonly property real follow: root.phone ? Style.space(12) + contentHeight : height clip: true color: root.phone ? "transparent" : Commons.Color.popups.background // The bar's popups' own border (KeyboardPanel): the theme's spec. @@ -666,7 +671,7 @@ Item { xScale: card.grow yScale: card.grow }, - Translate { y: root.popupStyle ? 0 : root.reveal * root.pullSpan - card.y - card.height * card.grow } + Translate { y: root.popupStyle ? 0 : root.reveal * root.pullSpan - card.y - card.follow * card.grow } ] // Coming in: solid within the first quarter of the way, most of it at // once. Going out (let go to close, or pushed up from open): it fades From 0066c7a19c455a8af3a9db4f04c89298c4fe9561 Mon Sep 17 00:00:00 2001 From: Henrik Klee Date: Fri, 20 Nov 2026 03:50:13 +0800 Subject: [PATCH 24/32] Control center: a phone's sheet goes opaque within a quarter of the pull On a phone the sheet faded in with the pull's whole way, so the control center looked almost invisible while dragged. It now comes and goes with its content: opaque within the first quarter of a pull, gone as the content's bottom reaches the bar on the way out. Assisted-by: LLM --- desktop/shell/shell/controlcenter/ControlCenter.qml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop/shell/shell/controlcenter/ControlCenter.qml b/desktop/shell/shell/controlcenter/ControlCenter.qml index 1a16acf6..79d14110 100644 --- a/desktop/shell/shell/controlcenter/ControlCenter.qml +++ b/desktop/shell/shell/controlcenter/ControlCenter.qml @@ -551,7 +551,10 @@ Item { color: root.phone ? Commons.Color.menu.background : Commons.Color.menu.scrim // Software rendering dims in one step rather than blending the whole // screen again on every frame of a pull. - opacity: root.popupStyle ? 0 : (root.gpu ? Math.max(0, Math.min(1, root.reveal)) : (root.reveal > 0 ? 1 : 0)) + // A phone's sheet comes and goes with its content: opaque within the + // first quarter of a pull. + opacity: root.popupStyle ? 0 : root.phone ? card.opacity + : (root.gpu ? Math.max(0, Math.min(1, root.reveal)) : (root.reveal > 0 ? 1 : 0)) MouseArea { anchors.fill: parent acceptedButtons: Qt.LeftButton | Qt.RightButton From e62cd2faccfa3cf58d843182d0b6915b982bce9a Mon Sep 17 00:00:00 2001 From: Henrik Klee Date: Fri, 20 Nov 2026 03:51:00 +0800 Subject: [PATCH 25/32] Control center: a phone's sheet goes opaque at 60 % of the pull A quarter was too quick; it now eases out to opaque at 60 %. Assisted-by: LLM --- desktop/shell/shell/controlcenter/ControlCenter.qml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/desktop/shell/shell/controlcenter/ControlCenter.qml b/desktop/shell/shell/controlcenter/ControlCenter.qml index 79d14110..1513b015 100644 --- a/desktop/shell/shell/controlcenter/ControlCenter.qml +++ b/desktop/shell/shell/controlcenter/ControlCenter.qml @@ -551,9 +551,10 @@ Item { color: root.phone ? Commons.Color.menu.background : Commons.Color.menu.scrim // Software rendering dims in one step rather than blending the whole // screen again on every frame of a pull. - // A phone's sheet comes and goes with its content: opaque within the - // first quarter of a pull. - opacity: root.popupStyle ? 0 : root.phone ? card.opacity + // A phone's sheet comes in easing out, opaque at 60 % of a pull, and + // goes with its content. + opacity: root.popupStyle ? 0 : root.phone + ? (!root.gpu || root.leaving ? card.opacity : 1 - Math.pow(1 - Math.max(0, Math.min(1, root.reveal / 0.6)), 2)) : (root.gpu ? Math.max(0, Math.min(1, root.reveal)) : (root.reveal > 0 ? 1 : 0)) MouseArea { anchors.fill: parent From e8e7815fa63b208447abc650d910563657bea8a1 Mon Sep 17 00:00:00 2001 From: Henrik Klee Date: Fri, 20 Nov 2026 03:52:10 +0800 Subject: [PATCH 26/32] Control center: a phone's sheet is opaque only as the pull arrives It still comes in quickly at first, easing out over the whole pull. Assisted-by: LLM --- desktop/shell/shell/controlcenter/ControlCenter.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/desktop/shell/shell/controlcenter/ControlCenter.qml b/desktop/shell/shell/controlcenter/ControlCenter.qml index 1513b015..e3c494e5 100644 --- a/desktop/shell/shell/controlcenter/ControlCenter.qml +++ b/desktop/shell/shell/controlcenter/ControlCenter.qml @@ -551,10 +551,10 @@ Item { color: root.phone ? Commons.Color.menu.background : Commons.Color.menu.scrim // Software rendering dims in one step rather than blending the whole // screen again on every frame of a pull. - // A phone's sheet comes in easing out, opaque at 60 % of a pull, and - // goes with its content. + // A phone's sheet comes in quickly at first, easing out, and is opaque + // only as the pull arrives; it goes with its content. opacity: root.popupStyle ? 0 : root.phone - ? (!root.gpu || root.leaving ? card.opacity : 1 - Math.pow(1 - Math.max(0, Math.min(1, root.reveal / 0.6)), 2)) + ? (!root.gpu || root.leaving ? card.opacity : 1 - Math.pow(1 - Math.max(0, Math.min(1, root.reveal)), 2.5)) : (root.gpu ? Math.max(0, Math.min(1, root.reveal)) : (root.reveal > 0 ? 1 : 0)) MouseArea { anchors.fill: parent From 3c096305efc242b45a36b3e4194c4db822b6c99b Mon Sep 17 00:00:00 2001 From: Henrik Klee Date: Fri, 20 Nov 2026 03:54:56 +0800 Subject: [PATCH 27/32] Launcher: the search field no longer stretches on open The field animated every change of its width, and the launcher's width is set as its window maps on open, so opening showed the field stretching to the right as if Cancel had been pressed. Only Cancel coming and going animates it now. Assisted-by: LLM --- desktop/shell/shell/launcher/Launcher.qml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/desktop/shell/shell/launcher/Launcher.qml b/desktop/shell/shell/launcher/Launcher.qml index 559889b1..3e84f982 100644 --- a/desktop/shell/shell/launcher/Launcher.qml +++ b/desktop/shell/shell/launcher/Launcher.qml @@ -1112,12 +1112,15 @@ LC_ALL=C pacman -Qi omarchy-a 2>/dev/null | awk \'/^Depends On/ { on = 1 } /^Opt BorderSurface { id: searchBox readonly property bool hot: searchHover.hovered - width: parent.width - (content.trailing > 0 ? content.trailing + Style.spacing.lg : 0) - height: root.searchHeight - Behavior on width { + // Only Cancel coming and going animates the field; the launcher's + // own size (set as its window maps on open) takes effect at once. + property real cancelShare: root.searching ? 1 : 0 + Behavior on cancelShare { enabled: root.gpu && root.opened NumberAnimation { duration: Style.duration(180); easing.type: Easing.OutCubic } } + width: parent.width - searchBox.cancelShare * (cancelButton.width + Style.spacing.lg) + height: root.searchHeight radius: Style.cornerRadius // Focus in the shipped [controls] mirrors hover, whose border is // fainter than idle's, so a focused field would read as less active From 6e95e13df3a69c1bf9a194896577ed43209b0d88 Mon Sep 17 00:00:00 2001 From: Henrik Klee Date: Fri, 20 Nov 2026 03:57:26 +0800 Subject: [PATCH 28/32] Launcher: comes in settling from just over its size It scales from 103 % down to its size on open (and back on close), rather than growing from 98 %. Assisted-by: LLM --- desktop/shell/shell/launcher/Launcher.qml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/desktop/shell/shell/launcher/Launcher.qml b/desktop/shell/shell/launcher/Launcher.qml index 3e84f982..949c4e5f 100644 --- a/desktop/shell/shell/launcher/Launcher.qml +++ b/desktop/shell/shell/launcher/Launcher.qml @@ -1097,8 +1097,9 @@ LC_ALL=C pacman -Qi omarchy-a 2>/dev/null | awk \'/^Depends On/ { on = 1 } /^Opt Scale { origin.x: content.width / 2 origin.y: 0 - xScale: 0.98 + 0.02 * root.reveal - yScale: 0.98 + 0.02 * root.reveal + // Comes in settling from just over its size (and goes the same way). + xScale: 1.03 - 0.03 * root.reveal + yScale: 1.03 - 0.03 * root.reveal }, Translate { y: Style.space(10) * (1 - root.reveal) } ] From 47629f482d80bd91a2194f4ddfca465cc335f6fc Mon Sep 17 00:00:00 2001 From: Henrik Klee Date: Fri, 20 Nov 2026 03:59:23 +0800 Subject: [PATCH 29/32] Launcher: an opaque background as a toggle Trigger > Toggle > Opaque Launcher shows the launcher on the theme's plain menu background instead of the frosted wallpaper (Frosted Launcher turns it back). The launcher-opaque flag is read each time it opens, and no blurred copy is made while it is on. Assisted-by: LLM --- desktop/shell/bin/omarchy-toggle-launcher-opaque | 10 ++++++++++ desktop/shell/default/omarchy/omarchy-menu.jsonc | 2 ++ desktop/shell/shell/launcher/Launcher.qml | 15 +++++++++++++-- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100755 desktop/shell/bin/omarchy-toggle-launcher-opaque diff --git a/desktop/shell/bin/omarchy-toggle-launcher-opaque b/desktop/shell/bin/omarchy-toggle-launcher-opaque new file mode 100755 index 00000000..747ef6ff --- /dev/null +++ b/desktop/shell/bin/omarchy-toggle-launcher-opaque @@ -0,0 +1,10 @@ +#!/bin/bash + +# omarchy:summary=Show the launcher on the theme's plain background, or on the frosted wallpaper +# Frosted by default. Turned on, the launcher-opaque flag says so; the +# launcher reads it each time it opens. +set -euo pipefail +[[ $# == 0 ]] || { echo 'Usage: omarchy-toggle-launcher-opaque' >&2; exit 2; } +toggles=$HOME/.local/state/omarchy/toggles +mkdir -p "$toggles" +if [[ -e $toggles/launcher-opaque ]]; then rm -f "$toggles/launcher-opaque"; else : >"$toggles/launcher-opaque"; fi diff --git a/desktop/shell/default/omarchy/omarchy-menu.jsonc b/desktop/shell/default/omarchy/omarchy-menu.jsonc index 2c54a0ad..1c2eccdf 100644 --- a/desktop/shell/default/omarchy/omarchy-menu.jsonc +++ b/desktop/shell/default/omarchy/omarchy-menu.jsonc @@ -171,6 +171,8 @@ "trigger.toggle.notifications-off": {"icon":"󰂛","label":"Silence Notifications","when":"[[ $(omarchy-shell notifications isDnd) != on ]]","action":"omarchy-toggle-notification-silencing"}, "trigger.toggle.nightlight-on": {"icon":"󰔎","label":"Nightlight On","when":"[[ $(omarchy-toggle-nightlight --status) != *'\"enabled\":true'* ]]","action":"omarchy-toggle-nightlight"}, "trigger.toggle.nightlight-off": {"icon":"󰔎","label":"Nightlight Off","when":"[[ $(omarchy-toggle-nightlight --status) == *'\"enabled\":true'* ]]","action":"omarchy-toggle-nightlight"}, + "trigger.toggle.launcher-opaque": {"icon":"󰀻","label":"Opaque Launcher","when":"! omarchy-toggle-enabled launcher-opaque","action":"omarchy-toggle-launcher-opaque"}, + "trigger.toggle.launcher-frosted": {"icon":"󰀻","label":"Frosted Launcher","when":"omarchy-toggle-enabled launcher-opaque","action":"omarchy-toggle-launcher-opaque"}, "trigger.toggle.screensaver-on": {"icon":"󱄄","label":"Screensaver On","when":"omarchy-toggle-enabled screensaver-off","action":"omarchy-toggle-screensaver"}, "trigger.toggle.screensaver-off": {"icon":"󱄄","label":"Screensaver Off","when":"! omarchy-toggle-enabled screensaver-off","action":"omarchy-toggle-screensaver"}, "trigger.toggle.crash-capture-on": {"icon":"󱚡","label":"Crash Capture On","when":"omarchy-toggle-enabled crash-capture-off","action":"omarchy-toggle-crash-capture"}, diff --git a/desktop/shell/shell/launcher/Launcher.qml b/desktop/shell/shell/launcher/Launcher.qml index 949c4e5f..23a6fd0c 100644 --- a/desktop/shell/shell/launcher/Launcher.qml +++ b/desktop/shell/shell/launcher/Launcher.qml @@ -552,7 +552,17 @@ Item { } } - Component.onCompleted: wallpaperProc.running = true + Component.onCompleted: { wallpaperProc.running = true; opaqueProc.running = true } + + // Orchard: Trigger > Toggle > Opaque Launcher shows it on the theme's + // plain background instead of the frosted wallpaper (no blurred copy is + // made then). Read as it opens. + property bool opaque: false + Process { + id: opaqueProc + command: ["omarchy-toggle-enabled", "launcher-opaque"] + onExited: function(code) { root.opaque = code === 0 } + } // The background plugin names the new wallpaper the moment a theme or // background switch sets it, before its own fade: the blurred copy is made @@ -572,7 +582,7 @@ Item { readonly property real backdropTint: 0.8 readonly property color backdropColor: Commons.Color.menu.background // Everything but the size: what makes a background outdated. - readonly property string backdropLook: wallpaper + readonly property string backdropLook: wallpaper && !opaque ? ["frosted4", wallpaper, Math.round(backdropColor.r * 255), Math.round(backdropColor.g * 255), Math.round(backdropColor.b * 255), backdropTint].join("|") : "" readonly property string backdropKey: backdropKeyFor(backdropWidth, backdropHeight) readonly property string backdropPath: backdropPathFor(backdropKey) @@ -661,6 +671,7 @@ Item { if (root.menu) root.menu.evaluateGuards() // A wallpaper changed since: the next open shows it. wallpaperProc.running = true + opaqueProc.running = true root.endSearch() root.pageIndex = 0 root.zone = "" From c59e9c0966c7d182e8deb632139dfeb7973ff42f Mon Sep 17 00:00:00 2001 From: Henrik Klee Date: Fri, 20 Nov 2026 04:01:01 +0800 Subject: [PATCH 30/32] Launcher: Settings in the inactive tabs' colour The Settings button beside the tabs was in the full text colour, more prominent than the tabs themselves; it takes the inactive tabs' colour now, brighter only while focused, as a tab is. Assisted-by: LLM --- desktop/shell/shell/launcher/Launcher.qml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/desktop/shell/shell/launcher/Launcher.qml b/desktop/shell/shell/launcher/Launcher.qml index 23a6fd0c..dc38be2f 100644 --- a/desktop/shell/shell/launcher/Launcher.qml +++ b/desktop/shell/shell/launcher/Launcher.qml @@ -1344,6 +1344,9 @@ LC_ALL=C pacman -Qi omarchy-a 2>/dev/null | awk \'/^Depends On/ { on = 1 } /^Opt // finger gets 44 points, more than the highlight shows. Item { id: settingsButton + // In the inactive tabs' colour, brighter only while focused, as a + // tab is. + readonly property bool lit: root.keyFocus("tabs", root.settingsStop) anchors.right: parent.right height: parent.height width: settingsRow.implicitWidth + Style.space(16) @@ -1363,7 +1366,7 @@ LC_ALL=C pacman -Qi omarchy-a 2>/dev/null | awk \'/^Depends On/ { on = 1 } /^Opt Text { anchors.verticalCenter: parent.verticalCenter text: "\uf013" - color: root.text + color: settingsButton.lit ? root.text : root.faint font.family: Style.font.menuFamily font.pixelSize: Style.font.body } @@ -1371,7 +1374,7 @@ LC_ALL=C pacman -Qi omarchy-a 2>/dev/null | awk \'/^Depends On/ { on = 1 } /^Opt anchors.verticalCenter: parent.verticalCenter textFormat: Text.PlainText text: Commons.I18n.t("launcher.settings") - color: root.text + color: settingsButton.lit ? root.text : root.faint font.family: Style.font.menuFamily font.pixelSize: Style.font.subtitle } From 79a44c96a21b257765fabc261cd8ccad638148a9 Mon Sep 17 00:00:00 2001 From: Henrik Klee Date: Fri, 20 Nov 2026 04:51:36 +0800 Subject: [PATCH 31/32] Control center: a long press arms after 0.4 s again 0.2 s armed a slider that was about to be dragged; 0.4 s for sliders and tiles alike, opening by itself 0.6 s after arming as before. Assisted-by: LLM --- desktop/shell/shell/controlcenter/ControlCenter.qml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/desktop/shell/shell/controlcenter/ControlCenter.qml b/desktop/shell/shell/controlcenter/ControlCenter.qml index e3c494e5..9a536676 100644 --- a/desktop/shell/shell/controlcenter/ControlCenter.qml +++ b/desktop/shell/shell/controlcenter/ControlCenter.qml @@ -892,7 +892,7 @@ Item { } } } - // Tap toggles; a right click opens the page. Held still (0.2 s), the + // Tap toggles; a right click opens the page. Held still (0.4 s), the // touch arms the page as on a slider: the tile shows it is held, lifting // opens the page, sliding off cancels. One rule for every control: a tap // never opens another level. @@ -900,7 +900,7 @@ Item { id: tileMouse anchors.fill: parent acceptedButtons: Qt.LeftButton | Qt.RightButton - pressAndHoldInterval: 200 + pressAndHoldInterval: 400 // A button keeps its touch: sliding off cancels, and the control center // is not dragged away. preventStealing: true @@ -1042,12 +1042,12 @@ Item { enabled: slider.available preventStealing: true // The level goes where the finger is: on a tap when it lifts, on a - // drag as soon as it moves and from then on. Held still (0.2 s), the + // drag as soon as it moves and from then on. Held still (0.4 s), the // touch arms the page instead and changes nothing: the slider shows it // is held, lifting opens the page, sliding off cancels (and back on // arms it again). Nothing happens on the touch itself before it is // known which it is. - pressAndHoldInterval: 200 + pressAndHoldInterval: 400 property point pressedAt property bool moving: false property bool held: false From 769c74243bea60a72200a233099a41a46a9e22aa Mon Sep 17 00:00:00 2001 From: Henrik Klee Date: Fri, 20 Nov 2026 05:15:05 +0800 Subject: [PATCH 32/32] Changelog: the compact bar, the launcher's zoom and opaque background Assisted-by: LLM --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fbf6f081..dc2d21d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,11 @@ is missing or empty. - A control center: pull down from the top right, click its icon or press Super+Ctrl+1 for Wi-Fi, Bluetooth, brightness, volume and quick toggles. Long-press for the full settings pages. +- The status bar is back to Omarchy's compact size. Stay Awake sits with the + icons on the right, and the keyboard button is gone: swipe up from the + bottom, or use the control center. +- The launcher opens with a gentle zoom, and can use an opaque background + instead of the blurred wallpaper (Trigger > Toggle). ## [0.3.2] - 2026-11-19