From 52fa8759e868c750d72b14ed521275111ca7d95a Mon Sep 17 00:00:00 2001 From: Zack Yang Date: Thu, 17 Sep 2026 12:52:47 +0700 Subject: [PATCH 1/2] Take the 4.0.3 pluginDir fix and the startup config read from the mirror Ported into plugin/ from displaywright-shell-plugin#3 and #2, since the repository they were opened against is generated from this directory and would lose them at the next publish. Omarchy 4.0.3 stopped handing third-party plugins the host's private __sourceDir (publicPluginManifest deletes it at shell.qml:320, still there in 4.0.4). Every path this plugin built from it went empty: the service never read wallpapers.json, the overlay never read monitors.lua, and the launcher entry was never installed. Reproduced here on 4.0.4-1 before touching anything -- two displays pinned in the config, `status` reporting theme for both. The three entry files sit at the plugin root, so the directory now comes from Qt.resolvedUrl(".") in each, percent-decoded; LauncherEntry takes it from the service instead of the manifest. Checked offline that the resolved directory matches through both Qt.createComponent and a Loader, and with a space in the path. The startup read is the other half. pluginDir used to arrive after construction and onPluginDirChanged ran before configReader's command binding had re-evaluated, so the reader ran its ["true"] placeholder and read nothing -- pins came back only when the file was next written. pluginDir is a constant now, but the handler still fires during construction, and a probe shows the child's binding has not been evaluated at that moment either. Setting the command at the point the read starts covers both orderings; the comment says why, rather than the reason that stopped being true. The reload IPC also called configFile.reload() on a FileView that no longer exists, so `omarchy-shell displaywright reload` returned an error instead of ok. It calls reloadConfig() now. Version 0.7.4, in the package as well as the manifest, as the last bump did. Co-Authored-By: MACHO MAN Co-Authored-By: Pawel Waszkiewicz Co-Authored-By: Claude Fable 5.1 --- displaywright/__init__.py | 2 +- plugin/Arrange.qml | 9 +++++++-- plugin/LauncherEntry.qml | 8 ++++---- plugin/Wallpaper.qml | 29 ++++++++++++++++++++++------- plugin/manifest.json | 2 +- 5 files changed, 35 insertions(+), 15 deletions(-) diff --git a/displaywright/__init__.py b/displaywright/__init__.py index ee0c94c..b65693f 100644 --- a/displaywright/__init__.py +++ b/displaywright/__init__.py @@ -12,7 +12,7 @@ ``omarchy-shell`` plugin that draws it. """ -__version__ = "0.7.3" +__version__ = "0.7.4" APP_ID = "ai.bkblab.displaywright" APP_NAME = "displaywright" diff --git a/plugin/Arrange.qml b/plugin/Arrange.qml index d000874..e996531 100644 --- a/plugin/Arrange.qml +++ b/plugin/Arrange.qml @@ -53,8 +53,13 @@ Item { readonly property string configHome: Quickshell.env("XDG_CONFIG_HOME") || (home + "/.config") readonly property string monitorsPath: configHome + "/hypr/monitors.lua" //: Where this plugin was loaded from, for the scripts shipped beside it. - readonly property string pluginDir: manifest && manifest.__sourceDir - ? String(manifest.__sourceDir) : "" + //: Third-party manifests do not carry the host's private `__sourceDir` + //: (Omarchy 4.0.3 sanitizes it), so resolve from this file at the root. + readonly property string pluginDir: { + var url = String(Qt.resolvedUrl(".")) + if (url.indexOf("file://") !== 0) return "" + try { return decodeURIComponent(url.substring(7)).replace(/\/$/, "") } catch (e) { return "" } + } function touch() { revision += 1 } diff --git a/plugin/LauncherEntry.qml b/plugin/LauncherEntry.qml index ea3e67d..9c6a1d3 100644 --- a/plugin/LauncherEntry.qml +++ b/plugin/LauncherEntry.qml @@ -17,6 +17,7 @@ QtObject { id: root property var manifest: null + property string pluginDir: "" readonly property string dest: Quickshell.env("HOME") + "/.local/share/applications/displaywright.desktop" @@ -53,7 +54,7 @@ QtObject { // Component.onCompleted, so the paths are built when it arrives rather than // bound -- a binding has not re-evaluated by the time that fires. onManifestChanged: { - var dir = manifest && manifest.__sourceDir + var dir = root.pluginDir if (installed || !dir) return installed = true //: execDetached reports nothing back, so this line is the only evidence @@ -66,11 +67,10 @@ QtObject { Component.onDestruction: { if (!installed) return - var dir = manifest && manifest.__sourceDir //: No folder to test means no way to tell a reload from a removal, and //: keeping the entry is the half that cannot lose one. - if (!dir) return + if (!root.pluginDir) return Quickshell.execDetached(["sh", "-c", removeScript, "sh", - dest, marker, dir + "/manifest.json"]) + dest, marker, root.pluginDir + "/manifest.json"]) } } diff --git a/plugin/Wallpaper.qml b/plugin/Wallpaper.qml index 0112574..1ebab14 100644 --- a/plugin/Wallpaper.qml +++ b/plugin/Wallpaper.qml @@ -51,7 +51,7 @@ Item { //: A plain child rather than a typed property: resolving a sibling .qml as //: a property *type* is stricter than instantiating it, and this file is //: the one whose failure takes every wallpaper on the desktop with it. - LauncherEntry { manifest: root.manifest } + LauncherEntry { manifest: root.manifest; pluginDir: root.pluginDir } //: A plain-value snapshot of the shell theme, for the same reason. readonly property var palette: ({ @@ -67,11 +67,16 @@ Item { readonly property string configHome: Quickshell.env("XDG_CONFIG_HOME") || (home + "/.config") readonly property string configPath: configHome + "/displaywright/wallpapers.json" - // Where this plugin was loaded from. The shell stamps it into the manifest; - // hardcoding an install path would break a symlinked checkout and anyone who - // installed by hand somewhere else. - readonly property string pluginDir: manifest && manifest.__sourceDir - ? String(manifest.__sourceDir) : "" + // Where this plugin was loaded from: this file sits at the plugin root, so + // the directory resolves from here. Third-party manifests do not carry the + // host's private `__sourceDir` (Omarchy 4.0.3 sanitizes it), and hardcoding + // an install path would break a symlinked checkout and anyone who installed + // by hand somewhere else. + readonly property string pluginDir: { + var url = String(Qt.resolvedUrl(".")) + if (url.indexOf("file://") !== 0) return "" + try { return decodeURIComponent(url.substring(7)).replace(/\/$/, "") } catch (e) { return "" } + } // ---------------------------------------------------------------- config @@ -134,6 +139,16 @@ Item { function reloadConfig() { if (!root.pluginDir || configReader.running) return + //: The first call comes from onPluginDirChanged, which fires while this + //: object is still being built: the engine evaluates the root's bindings + //: before its children's, so configReader exists but its command binding + //: has not run yet. When pluginDir still arrived late, off the manifest, + //: the same handler ran ahead of the re-evaluation and started the ["true"] + //: placeholder instead -- it collected nothing, and every output sat on + //: the theme background until wallpapers.json was next written + //: (displaywright-shell-plugin#2). Set the command outright, so the read + //: is against the path whichever binding pass got there first. + configReader.command = [root.pluginDir + "/read-config.sh", root.configPath] configReader.running = true } @@ -203,7 +218,7 @@ Item { target: "displaywright" function reload(): string { - configFile.reload() + root.reloadConfig() root.refreshSpanBox() return "ok" } diff --git a/plugin/manifest.json b/plugin/manifest.json index 1db0bf8..7f4bf50 100644 --- a/plugin/manifest.json +++ b/plugin/manifest.json @@ -2,7 +2,7 @@ "schemaVersion": 1, "id": "ai.bkblab.displaywright", "name": "Displaywright", - "version": "0.7.3", + "version": "0.7.4", "author": "bkblab.ai", "license": "MIT", "description": "Per-display wallpapers and a display arrangement editor, inside omarchy-shell. Open it from the Apps menu: SUPER+ALT+SPACE, then type Displays. Or double-click one display's background to give just that display a wallpaper.", From 255e429e776cfe7a4137affdf832b7e9e07ef4f3 Mon Sep 17 00:00:00 2001 From: Zack Yang Date: Thu, 17 Sep 2026 12:55:26 +0700 Subject: [PATCH 2/2] Draw a launcher icon that looks like the product The old one was three white rectangles on a flat blue plate, and in the app menu at 18px it read as a generic settings tile. The new one is a dusk wallpaper -- night sky down to a warm horizon, a sun, hills -- with two display frames standing in front of it, one landscape and one portrait, each framing its own piece of the picture. That is what the plugin does. Still drawn in QML through `make icon`, now on a Canvas so the gradient, the glow and the hill curve are one paint routine rather than a stack of Rectangles. Checked downscaled to 24px: the two frames and the sun survive, which is all a menu row has room to show. Co-Authored-By: Claude Fable 5.1 --- plugin/icon.png | Bin 3045 -> 20755 bytes tools/tst_icon.qml | 117 ++++++++++++++++++++++++++++++++++----------- 2 files changed, 90 insertions(+), 27 deletions(-) diff --git a/plugin/icon.png b/plugin/icon.png index 9625646ebdbc2a83f271cd802e5b5580b309fd2c..38957c510cf85765165e5cabf5e965f45b0257bc 100644 GIT binary patch literal 20755 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 WyzHdL3G5L700005{fy2jV8lFdq+UU~x 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 M^h|YMohF6+3(|3gqyPW_ diff --git a/tools/tst_icon.qml b/tools/tst_icon.qml index 472d4cb..b349c08 100644 --- a/tools/tst_icon.qml +++ b/tools/tst_icon.qml @@ -2,8 +2,9 @@ // // make icon // -// Drawn rather than sourced so there is nothing to lose track of, and kept to -// three shapes because the launcher renders it at 32px as often as 256. +// Drawn rather than sourced so there is nothing to lose track of. The app +// menu shows it at around 24px, so it is one silhouette: two display frames +// standing in front of a dusk wallpaper, each framing its own piece of it. import QtQuick import QtTest @@ -16,37 +17,99 @@ TestCase { width: 256 height: 256 - Component { + Canvas { id: art - Rectangle { - width: 256; height: 256 - radius: 56 - gradient: Gradient { - GradientStop { position: 0.0; color: "#4a90e2" } - GradientStop { position: 1.0; color: "#2b5fa8" } - } - - // Two landscape displays side by side and one turned portrait: the - // arrangement is the product, so the icon is an arrangement. - Rectangle { - x: 34; y: 96; width: 92; height: 60; radius: 7 - color: "#ffffff"; opacity: 0.95 - } - Rectangle { - x: 134; y: 74; width: 88; height: 56; radius: 7 - color: "#ffffff"; opacity: 0.72 - } - Rectangle { - x: 150; y: 140; width: 44; height: 68; radius: 7 - color: "#ffffff"; opacity: 0.45 - } + width: 256; height: 256 + renderStrategy: Canvas.Immediate + renderTarget: Canvas.Image + + function roundRect(ctx, x, y, w, h, r) { + ctx.beginPath() + ctx.moveTo(x + r, y) + ctx.arcTo(x + w, y, x + w, y + h, r) + ctx.arcTo(x + w, y + h, x, y + h, r) + ctx.arcTo(x, y + h, x, y, r) + ctx.arcTo(x, y, x + w, y, r) + ctx.closePath() + } + + // A display: glass that lifts the scene behind it, a bright bezel, and a + // stand. Drawn heavy on purpose -- at 24px anything thinner vanishes. + function display(ctx, x, y, w, h) { + ctx.save() + ctx.shadowColor = "rgba(20, 10, 40, 0.45)" + ctx.shadowBlur = 18 + ctx.shadowOffsetY = 8 + roundRect(ctx, x, y, w, h, 12) + ctx.fillStyle = "rgba(255, 255, 255, 0.2)" + ctx.fill() + ctx.restore() + + roundRect(ctx, x, y, w, h, 12) + ctx.lineWidth = 11 + ctx.strokeStyle = "#fff8f0" + ctx.stroke() + + // stand + var cx = x + w / 2 + roundRect(ctx, cx - 5, y + h + 4, 10, 14, 4) + ctx.fillStyle = "#fff8f0" + ctx.fill() + roundRect(ctx, cx - 22, y + h + 16, 44, 9, 4.5) + ctx.fill() + } + + onPaint: { + var ctx = getContext("2d") + ctx.reset() + ctx.clearRect(0, 0, width, height) + + // The plate, and everything after it clipped to it. + roundRect(ctx, 0, 0, 256, 256, 58) + ctx.clip() + + // The wallpaper: night at the top down to a warm horizon. + var sky = ctx.createLinearGradient(0, 0, 0, 256) + sky.addColorStop(0.00, "#1b1f5e") + sky.addColorStop(0.45, "#6a3fb5") + sky.addColorStop(0.72, "#e9647a") + sky.addColorStop(1.00, "#ffb05a") + ctx.fillStyle = sky + ctx.fillRect(0, 0, 256, 256) + + // The sun, framed by the wide display, with its glow. + var glow = ctx.createRadialGradient(96, 122, 10, 96, 122, 70) + glow.addColorStop(0, "rgba(255, 225, 150, 0.5)") + glow.addColorStop(1, "rgba(255, 225, 150, 0)") + ctx.fillStyle = glow + ctx.fillRect(0, 0, 256, 256) + ctx.beginPath() + ctx.arc(96, 122, 24, 0, Math.PI * 2) + ctx.fillStyle = "#ffe08a" + ctx.fill() + + // Hills along the bottom. + ctx.fillStyle = "#2a1a4a" + ctx.beginPath() + ctx.moveTo(0, 256) + ctx.lineTo(0, 212) + ctx.bezierCurveTo(50, 190, 110, 228, 168, 200) + ctx.bezierCurveTo(200, 184, 232, 196, 256, 214) + ctx.lineTo(256, 256) + ctx.closePath() + ctx.fill() + + // Two displays: one landscape, one turned portrait. The arrangement is + // the product, so the icon is an arrangement. + display(ctx, 30, 76, 124, 84) + display(ctx, 170, 52, 58, 108) } } function test_shoot() { - const item = art.createObject(suite) + art.requestPaint() wait(300) - const shot = grabImage(item) + const shot = grabImage(art) shot.save(String(Qt.resolvedUrl("../plugin/icon.png")).replace("file://", "")) verify(true) }