diff options
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | config/BarConfig.qml | 1 | ||||
| -rw-r--r-- | modules/bar/components/TrayItem.qml | 10 | ||||
| -rw-r--r-- | utils/Icons.qml | 13 |
4 files changed, 17 insertions, 8 deletions
@@ -331,6 +331,7 @@ default, you must create it manually. }, "tray": { "background": false, + "iconSubs": [], "recolour": false }, "workspaces": { diff --git a/config/BarConfig.qml b/config/BarConfig.qml index 65236bd..4815259 100644 --- a/config/BarConfig.qml +++ b/config/BarConfig.qml @@ -77,6 +77,7 @@ JsonObject { component Tray: JsonObject { property bool background: false property bool recolour: false + property list<var> iconSubs: [] } component Status: JsonObject { diff --git a/modules/bar/components/TrayItem.qml b/modules/bar/components/TrayItem.qml index 6e7c2c5..9911907 100644 --- a/modules/bar/components/TrayItem.qml +++ b/modules/bar/components/TrayItem.qml @@ -3,6 +3,7 @@ pragma ComponentBehavior: Bound import qs.components.effects import qs.services import qs.config +import qs.utils import Quickshell.Services.SystemTray import QtQuick @@ -26,14 +27,7 @@ MouseArea { id: icon anchors.fill: parent - source: { - let icon = root.modelData.icon; - if (icon.includes("?path=")) { - const [name, path] = icon.split("?path="); - icon = Qt.resolvedUrl(`${path}/${name.slice(name.lastIndexOf("/") + 1)}`); - } - return icon; - } + source: Icons.getTrayIcon(root.modelData.id, root.modelData.icon) colour: Colours.palette.m3secondary layer.enabled: Config.bar.tray.recolour } diff --git a/utils/Icons.qml b/utils/Icons.qml index 76eef43..45c1537 100644 --- a/utils/Icons.qml +++ b/utils/Icons.qml @@ -1,5 +1,6 @@ pragma Singleton +import qs.config import Quickshell import Quickshell.Services.Notifications @@ -205,4 +206,16 @@ Singleton { return "monitor_heart"; return name[0].toUpperCase(); } + + function getTrayIcon(id: string, icon: string): string { + for (const sub of Config.bar.tray.iconSubs) + if (sub.id === id) + return sub.image ? Qt.resolvedUrl(sub.image) : Quickshell.iconPath(sub.icon); + + if (icon.includes("?path=")) { + const [name, path] = icon.split("?path="); + icon = Qt.resolvedUrl(`${path}/${name.slice(name.lastIndexOf("/") + 1)}`); + } + return icon; + } } |