From b0ceb423d97ab02eb63847f1be3e0f36ec266148 Mon Sep 17 00:00:00 2001
From: Nydragon <contact@ccnlc.eu>
Date: Sat, 7 Sep 2024 22:00:44 +0200
Subject: [PATCH] feat: add systray context menus

---
 src/AudioOutput.qml                   |  3 ---
 src/Bar.qml                           |  6 ++----
 src/widgets/battery/Battery.qml       |  8 ++++----
 src/widgets/systray/SysTrayItem.qml   | 13 +++++++++++++
 src/windows/audioman/AudioEntry.qml   |  2 +-
 src/windows/audioman/AudioManager.qml |  1 +
 6 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/AudioOutput.qml b/src/AudioOutput.qml
index 6361a64..b8c75ac 100644
--- a/src/AudioOutput.qml
+++ b/src/AudioOutput.qml
@@ -20,11 +20,8 @@ BRectangle {
         objects: [audiow.sink]
     }
 
-    required property var popupAnchor
-
     AudioManager {
         id: audioman
-        anchor.window: audiow.popupAnchor
     }
 
     MouseArea {
diff --git a/src/Bar.qml b/src/Bar.qml
index 0d3f215..e630d98 100644
--- a/src/Bar.qml
+++ b/src/Bar.qml
@@ -11,7 +11,7 @@ Scope {
         model: Quickshell.screens
         // the screen from the screens list will be injected into this property
         PanelWindow {
-            id: root
+            id: lbar
             property var modelData
             screen: modelData
 
@@ -33,9 +33,7 @@ Scope {
                 // TODO: on click open a calendar view
                 ClockWidget {}
 
-                AudioOutput {
-                    popupAnchor: root
-                }
+                AudioOutput {}
 
                 SysTray {}
 
diff --git a/src/widgets/battery/Battery.qml b/src/widgets/battery/Battery.qml
index ae77a5d..c31e30a 100644
--- a/src/widgets/battery/Battery.qml
+++ b/src/widgets/battery/Battery.qml
@@ -17,16 +17,16 @@ BRectangle {
             width: parent.width * 4 / 5
             height: parent.height
             anchors.right: parent.right
-            percentage: UPower.displayDevice.healthPercentage
-            visible: UPower.displayDevice.healthSupported
+            percentage: UPower.displayDevice?.healthPercentage ?? 0
+            visible: UPower.displayDevice?.healthSupported ?? false
         }
         Pill {
             id: battery
-            width: parent.width * (!UPower.displayDevice.healthSupported || 3 / 5)
+            width: parent.width * (!UPower.displayDevice?.healthSupported || 3 / 5)
             height: parent.height
             anchors.left: parent.left
 
-            percentage: UPower.displayDevice.percentage
+            percentage: UPower.displayDevice?.percentage ?? 0
             color: 100 * percentage / 360
         }
     }
diff --git a/src/widgets/systray/SysTrayItem.qml b/src/widgets/systray/SysTrayItem.qml
index 68e3a7f..950d980 100644
--- a/src/widgets/systray/SysTrayItem.qml
+++ b/src/widgets/systray/SysTrayItem.qml
@@ -1,23 +1,36 @@
 import Quickshell.Services.SystemTray
 import QtQuick
 import QtQuick.Layouts
+import Quickshell
 
 MouseArea {
     id: root
     required property SystemTrayItem item
     Layout.fillWidth: true
     Layout.preferredHeight: parent.width
+    acceptedButtons: Qt.LeftButton | Qt.RightButton
 
     onClicked: event => {
         switch (event.button) {
         case Qt.LeftButton:
             item.activate();
             break;
+        case Qt.RightButton:
+            if (!item.hasMenu)
+                return;
+            menu.open();
+            break;
         default:
             console.log("Buttonevent unhandled");
         }
     }
 
+    QsMenuAnchor {
+        id: menu
+        menu: root.item.menu
+        anchor.window: lbar
+    }
+
     Rectangle {
         Layout.fillWidth: true
         Layout.preferredHeight: parent.width
diff --git a/src/windows/audioman/AudioEntry.qml b/src/windows/audioman/AudioEntry.qml
index 3f92d69..9cfee2d 100644
--- a/src/windows/audioman/AudioEntry.qml
+++ b/src/windows/audioman/AudioEntry.qml
@@ -65,7 +65,7 @@ RowLayout {
             }
 
             Button {
-                property bool isDefault: root.node.id === Pipewire.defaultAudioSink.id
+                property bool isDefault: root.node?.id === Pipewire.defaultAudioSink?.id
                 checked: isDefault
                 checkable: false
                 visible: root.node.isSink
diff --git a/src/windows/audioman/AudioManager.qml b/src/windows/audioman/AudioManager.qml
index 14630ad..c5d2304 100644
--- a/src/windows/audioman/AudioManager.qml
+++ b/src/windows/audioman/AudioManager.qml
@@ -8,6 +8,7 @@ PopupWindow {
     anchor {
         rect.x: 30
         rect.y: 20
+        window: lbar
     }
 
     color: "transparent"