From d0a61b9834631535bc0718deb43b440ea7703c42 Mon Sep 17 00:00:00 2001
From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com>
Date: Tue, 29 Apr 2025 23:29:51 +1000
Subject: bar: move tray + recolour option

Option to recolour tray icons
---
 config/BarConfig.qml            |  5 +++++
 modules/bar/Pills.qml           | 31 ++++++++++++++++++-------------
 modules/bar/components/Tray.qml |  3 ++-
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/config/BarConfig.qml b/config/BarConfig.qml
index 90d26eb..cdaaf7e 100644
--- a/config/BarConfig.qml
+++ b/config/BarConfig.qml
@@ -12,6 +12,7 @@ Singleton {
 
     readonly property Sizes sizes: Sizes {}
     readonly property Workspaces workspaces: Workspaces {}
+    readonly property Tray tray: Tray {}
     readonly property Presets presets: Presets {}
 
     component Sizes: QtObject {
@@ -27,6 +28,10 @@ Singleton {
         readonly property bool occupiedBg: true
     }
 
+    component Tray: QtObject {
+        readonly property bool recolourIcons: false
+    }
+
     component Preset: QtObject {
         required property string name
         required property int totalHeight
diff --git a/modules/bar/Pills.qml b/modules/bar/Pills.qml
index 503de02..8a329b9 100644
--- a/modules/bar/Pills.qml
+++ b/modules/bar/Pills.qml
@@ -57,35 +57,40 @@ Item {
         }
 
         Pill {
-            anchors.right: parent.right
-
-            Clock {
-                id: clock
+            anchors.right: rightPill.left
+            anchors.rightMargin: Appearance.padding.normal
 
+            Tray {
                 vertical: BarConfig.vertical
 
+                anchors.left: root.get(clock.right, undefined)
+                anchors.leftMargin: root.get(Appearance.padding.large, 0)
+                anchors.top: root.get(undefined, clock.bottom)
+                anchors.topMargin: root.get(0, Appearance.padding.large)
+
                 anchors.horizontalCenter: root.get(undefined, parent.horizontalCenter)
                 anchors.verticalCenter: root.get(parent.verticalCenter, undefined)
             }
+        }
 
-            Tray {
-                id: tray
+        Pill {
+            id: rightPill
 
-                vertical: BarConfig.vertical
+            anchors.right: parent.right
 
-                anchors.left: root.get(clock.right, undefined)
-                anchors.leftMargin: root.get(Appearance.padding.large, 0)
-                anchors.top: root.get(undefined, clock.bottom)
-                anchors.topMargin: root.get(0, Appearance.padding.large)
+            Clock {
+                id: clock
+
+                vertical: BarConfig.vertical
 
                 anchors.horizontalCenter: root.get(undefined, parent.horizontalCenter)
                 anchors.verticalCenter: root.get(parent.verticalCenter, undefined)
             }
 
             StatusIcons {
-                anchors.left: root.get(tray.right, undefined)
+                anchors.left: root.get(clock.right, undefined)
                 anchors.leftMargin: root.get(Appearance.padding.large, 0)
-                anchors.top: root.get(undefined, tray.bottom)
+                anchors.top: root.get(undefined, clock.bottom)
                 anchors.topMargin: root.get(0, Appearance.padding.large)
 
                 anchors.horizontalCenter: root.get(undefined, parent.horizontalCenter)
diff --git a/modules/bar/components/Tray.qml b/modules/bar/components/Tray.qml
index 37de73b..8aaa533 100644
--- a/modules/bar/components/Tray.qml
+++ b/modules/bar/components/Tray.qml
@@ -43,12 +43,13 @@ StyledRect {
                 IconImage {
                     id: icon
 
-                    visible: false
+                    visible: !BarConfig.tray.recolourIcons
                     source: item.modelData.icon
                     anchors.fill: parent
                 }
 
                 ColorOverlay {
+                    visible: BarConfig.tray.recolourIcons
                     anchors.fill: icon
                     source: icon
                     color: Appearance.colours.lavender
-- 
cgit v1.2.3-freya