Fix Warnings and implements Systray

2025-09-22 23:03:42 -03:00
parent 690a244bad
commit 99f7e41ff4
8 changed files with 156 additions and 114 deletions
--- a/SysTrayWidget.qml
+++ b/SysTrayWidget.qml
@@ -6,38 +6,92 @@ import Quickshell.Widgets
 import Quickshell.Services.SystemTray
 import qs.Common

-Item {
+WrapperRectangle {
+    id: systrayRoot
    property var monitor: ""
+    rightMargin: Theme.gaps
+    leftMargin: Theme.gaps
+    radius: 25

-    MarginWrapperManager {
-        leftMargin: 5
-    }
+    color: Theme.backgroudColor

-    Rectangle {
-        color:"blue"
-        implicitHeight: 50
-        implicitWidth: 50
-        // color: Theme.backgroudColor
-        radius: 25
-        RowLayout {
-            anchors{
-                horizontalCenter:parent.horizontalCenter
-                verticalCenter:parent.verticalCenter
-            }
-            Repeater {
-                model: SystemTray.items.values
-                delegate: IconImage {
-                    required property var modelData
-                    width:30; height:30
-                    source: modelData.icon
+    // color: Theme.backgroudColor
+    RowLayout {
+    Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
+        Repeater {
+            model: SystemTray.items.values
+            delegate: Rectangle {
+                id: systrayItem
+
+                required property var modelData
+                property var model: modelData
+                property string iconSource: {
+                    let icon = systrayItem.model && systrayItem.model.icon;
+                    if (typeof icon === 'string' || icon instanceof String) {
+                        if (icon.includes("?path=")) {
+                            const split = icon.split("?path=");
+                            if (split.length !== 2) {
+                                return icon;
+                            }
+
+                            const name = split[0];
+                            const path = split[1];
+                            const fileName = name.substring(name.lastIndexOf("/") + 1);
+                            return `file://${path}/${fileName}`;
+                        }
+                        return icon;
+                    }
+                    return "";
+                }
+
+                implicitHeight: 30
+                implicitWidth: 30
+                color:"transparent"
+
+                IconImage {
+                    anchors.verticalCenter:parent.verticalCenter
+                    anchors.horizontalCenter:parent.horizontalCenter
+                    width:25; height:25
+                    source: iconSource
+                }
+
+
+                MouseArea {
+                    anchors.fill: parent
+                    acceptedButtons: Qt.LeftButton | Qt.RightButton
+                    onClicked: (mouse) => {
+                        if (mouse.button === Qt.RightButton) { 
+
+                            const globalPos = mapToGlobal(0, 0);
+
+                            const currentScreen = systrayRoot.monitor
+                            const screenX = currentScreen.x || 0;
+                            console.log(screenX)
+                            const relativeX = globalPos.x - screenX;
+                            menuAnchor.menu = systrayItem.model.menu;
+                            menuAnchor.anchor.window = root;
+                            menuAnchor.anchor.rect = Qt.rect(
+                                globalPos.x,
+                                globalPos.y+10, 
+                                1, 
+                                1
+                            );
+                            menuAnchor.open();
+                            
+                        } else if (mouse.button === Qt.LeftButton) {
+                            // systrayItem.model.activate()
+                        }
+                    }
+                    onDoubleClicked: {
+                            systrayItem.model.activate()
+                    }
                }
            }
        }
-        MouseArea {
-            anchors.fill: parent
-            onClicked: {
-                console.log(SystemTray.items.values[0].icon)
-            }
-        }
+    }
+
+    QsMenuAnchor {
+        id: menuAnchor
+
    }
 }