2 files changed, 55 insertions, 52 deletions
diff --git a/modules/bar/components/Tray.qml b/modules/bar/components/Tray.qml
index 7a24338..2ce5cdc 100644
--- a/modules/bar/components/Tray.qml
+++ b/modules/bar/components/Tray.qml
@@ -1,11 +1,6 @@
 import "root:/widgets"
-import "root:/services"
-import "root:/config"
-import Quickshell
-import Quickshell.Widgets
 import Quickshell.Services.SystemTray
 import QtQuick
-import Qt5Compat.GraphicalEffects
 
 StyledRect {
     animate: true
@@ -16,53 +11,7 @@ StyledRect {
         Repeater {
             model: SystemTray.items
 
-            MouseArea {
-                id: item
-
-                required property SystemTrayItem modelData
-
-                acceptedButtons: Qt.LeftButton | Qt.RightButton
-                width: Appearance.font.size.smaller * 2
-                height: Appearance.font.size.smaller * 2
-
-                onClicked: event => {
-                    if (event.button === Qt.LeftButton)
-                        modelData.activate();
-                    else if (modelData.hasMenu)
-                        menu.open();
-                }
-
-                // TODO custom menu
-                QsMenuAnchor {
-                    id: menu
-
-                    menu: item.modelData.menu
-                    anchor.window: QsWindow.window
-                }
-
-                IconImage {
-                    id: icon
-
-                    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
-
-                    Behavior on color {
-                        ColorAnimation {
-                            duration: Appearance.anim.durations.normal
-                            easing.type: Easing.BezierSpline
-                            easing.bezierCurve: Appearance.anim.curves.standard
-                        }
-                    }
-                }
-            }
+            TrayItem {}
         }
     }
 }
diff --git a/modules/bar/components/TrayItem.qml b/modules/bar/components/TrayItem.qml
new file mode 100644
index 0000000..e6e9402
--- /dev/null
+++ b/modules/bar/components/TrayItem.qml
@@ -0,0 +1,54 @@
+import "root:/config"
+import Quickshell
+import Quickshell.Widgets
+import Quickshell.Services.SystemTray
+import QtQuick
+import Qt5Compat.GraphicalEffects
+
+MouseArea {
+    id: item
+
+    required property SystemTrayItem modelData
+
+    acceptedButtons: Qt.LeftButton | Qt.RightButton
+    width: Appearance.font.size.smaller * 2
+    height: Appearance.font.size.smaller * 2
+
+    onClicked: event => {
+        if (event.button === Qt.LeftButton)
+            modelData.activate();
+        else if (modelData.hasMenu)
+            menu.open();
+    }
+
+    // TODO custom menu
+    QsMenuAnchor {
+        id: menu
+
+        menu: item.modelData.menu
+        anchor.window: this.QsWindow.window
+    }
+
+    IconImage {
+        id: icon
+
+        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
+
+        Behavior on color {
+            ColorAnimation {
+                duration: Appearance.anim.durations.normal
+                easing.type: Easing.BezierSpline
+                easing.bezierCurve: Appearance.anim.curves.standard
+            }
+        }
+    }
+}