Modularlize the TopBar

2025-12-08 22:45:38 -05:00 · 2025-07-11 22:07:54 -04:00
parent ecbc835f10
commit 962c56c0ce
12 changed files with 1060 additions and 870 deletions
--- a/Widgets/TopBar/SystemTrayWidget.qml
+++ b/Widgets/TopBar/SystemTrayWidget.qml
@@ -0,0 +1,100 @@
+import QtQuick
+import Quickshell.Services.SystemTray
+import "../../Common"
+
+Rectangle {
+    id: root
+    
+    signal menuRequested(var menu, var item, real x, real y)
+    
+    width: Math.max(40, systemTrayRow.implicitWidth + Theme.spacingS * 2)
+    height: 32
+    radius: Theme.cornerRadius
+    color: Qt.rgba(Theme.secondary.r, Theme.secondary.g, Theme.secondary.b, 0.08)
+    visible: systemTrayRow.children.length > 0
+    
+    Row {
+        id: systemTrayRow
+        anchors.centerIn: parent
+        spacing: Theme.spacingXS
+        
+        Repeater {
+            model: SystemTray.items
+            delegate: Rectangle {
+                width: 24
+                height: 24
+                radius: Theme.cornerRadiusSmall
+                color: trayItemArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
+                
+                property var trayItem: modelData
+                
+                Image {
+                    anchors.centerIn: parent
+                    width: 18
+                    height: 18
+                    source: {
+                        let icon = trayItem?.icon || "";
+                        if (!icon) return "";
+                        
+                        if (icon.includes("?path=")) {
+                            const [name, path] = icon.split("?path=");
+                            const fileName = name.substring(name.lastIndexOf("/") + 1);
+                            return `file://${path}/${fileName}`;
+                        }
+                        return icon;
+                    }
+                    asynchronous: true
+                    smooth: true
+                    fillMode: Image.PreserveAspectFit
+                }
+                
+                MouseArea {
+                    id: trayItemArea
+                    anchors.fill: parent
+                    acceptedButtons: Qt.LeftButton | Qt.RightButton
+                    hoverEnabled: true
+                    cursorShape: Qt.PointingHandCursor
+                    
+                    onClicked: (mouse) => {
+                        if (!trayItem) return;
+                        
+                        if (mouse.button === Qt.LeftButton) {
+                            if (!trayItem.onlyMenu) {
+                                trayItem.activate()
+                            }
+                        } else if (mouse.button === Qt.RightButton) {
+                            if (trayItem.hasMenu) {
+                                console.log("Right-click detected, showing menu for:", trayItem.title || "Unknown")
+                                customTrayMenu.showMenu(mouse.x, mouse.y)
+                            } else {
+                                console.log("No menu available for:", trayItem.title || "Unknown")
+                            }
+                        }
+                    }
+                }
+                
+                QtObject {
+                    id: customTrayMenu
+                    
+                    property bool menuVisible: false
+                    
+                    function showMenu(x, y) {
+                        root.menuRequested(customTrayMenu, trayItem, x, y)
+                        menuVisible = true
+                    }
+                    
+                    function hideMenu() {
+                        menuVisible = false
+                    }
+                }
+                
+                Behavior on color {
+                    ColorAnimation {
+                        duration: Theme.shortDuration
+                        easing.type: Theme.standardEasing
+                    }
+                }
+            }
+        }
+    }
+}