extra sizing conditions for sys tray

bar/battery/BatteryIndicator.qml

@@ -21,27 +21,38 @@ Item {
         hoverEnabled: true
         anchors.fill: parent
         onClicked: {
+            if (root.popup.content == powerMenu) {
+                root.popup.hide();
+                return;
+            }
+
             root.popup.set(this, powerMenu);
             root.popup.show();
         }
     }
 
-    WrapperItem {
+    Item {
         id: powerMenu
         visible: false
+        implicitWidth: 250
+        implicitHeight: 80
 
-        ColumnLayout {
-            RowLayout {
-                id: powerProfiles
-                implicitWidth: 300
-                implicitHeight: 60
+        MouseArea {
+            anchors.fill: parent
+            onClicked: {
+                console.log("why this work");
+                powerMenu.implicitWidth = 300;
+            }
+        }
 
-                // place holder until I figured out what I want to do with material
-                ComboBox {
-                    model: ["Power Save", "Balanced", "Performance"]
-                    currentIndex: PowerProfiles.profile
-                    onCurrentIndexChanged: PowerProfiles.profile = currentIndex
-                }
+        RowLayout {
+            anchors.fill: parent
+
+            // placeholder for now
+            ComboBox {
+                model: ["Power Save", "Balanced", "Performance"]
+                currentIndex: PowerProfiles.profile
+                onCurrentIndexChanged: PowerProfiles.profile = currentIndex
             }
         }
     }

bar/popups/MenuWindow.qml

@@ -119,7 +119,7 @@ PopupWindow {
         // needed to handle occurences where items are resized while open
         onImplicitWidthChanged: {
             if (root.isOpen && popupContent.data !== []) {
-                console.log("repositioning popup");
+                // console.log("repositioning popup");
                 let itemPos = root.item.mapToItem(root.bar.contentItem, 0, root.bar.height, root.item.width, 0).x;
                 root.position(itemPos);
             }

bar/systray/SysTray.qml

@@ -49,6 +49,9 @@ RowLayout {
                 id: trayMenu
                 visible: false
 
+                property var leftItem: false
+                property var rightItem: false
+
                 ColumnLayout {
                     id: menuContainer
                     spacing: 2
@@ -56,11 +59,13 @@ RowLayout {
                     Repeater {
                         model: menuOpener.children
 
-                        delegate: TrayMenu {
+                        delegate: TrayMenuItem {
                             id: sysTrayContent
                             Layout.fillWidth: true
                             Layout.fillHeight: true
 
+                            rootMenu: trayMenu
+
                             onInteracted: {
                                 root.popup.hide();
                                 menuOpener.menu = null;

bar/systray/TrayMenuEntry.qml

@@ -9,8 +9,19 @@ import "../.."
 ColumnLayout {
     id: root
     required property QsMenuEntry menuData
+    required property var rootMenu
     signal interacted
 
+    Component.onCompleted: {
+        if (menuData?.buttonType !== QsMenuButtonType.None || menuData?.icon != "") {
+            rootMenu.leftItem = true;
+        }
+
+        if (!menuData?.hasChildren) {
+            rootMenu.rightItem = false;
+        }
+    }
+
     WrapperRectangle {
         Layout.fillWidth: true
         Layout.preferredHeight: 25
@@ -48,6 +59,7 @@ ColumnLayout {
                 Layout.fillWidth: true
 
                 Item {
+                    visible: root.rootMenu.leftItem
                     Layout.preferredWidth: 20
                     Layout.fillHeight: true
                     Layout.alignment: Qt.AlignVCenter
@@ -96,13 +108,14 @@ ColumnLayout {
                 }
 
                 Item {
+                    visible: root.rootMenu.rightItem
                     Layout.preferredHeight: 20
                     Layout.preferredWidth: 20
                     Layout.rightMargin: 5
 
                     Widgets.IconButton {
                         id: arrowButton
-                        visible: root.menuData?.hasChildren
+                        visible: root.menuData?.hasChildren ?? false
                         activeRectangle: false
                         source: "root:resources/general/right-arrow.svg"
                         rotation: subTrayMenu.visible ? 90 : 0
@@ -146,9 +159,10 @@ ColumnLayout {
 
                 delegate: BoundComponent {
                     id: subMenuEntry
-                    source: "TrayMenu.qml"
+                    source: "TrayMenuItem.qml"
                     Layout.fillWidth: true
                     required property var modelData
+                    property var rootMenu: root.rootMenu
                 }
             }
         }

bar/systray/TrayMenuItem.qml

@@ -6,6 +6,8 @@ import "../.."
 ColumnLayout {
     id: root
     required property QsMenuEntry modelData
+    required property var rootMenu
+    property var leftItem
     signal interacted
 
     Rectangle {
@@ -19,6 +21,7 @@ ColumnLayout {
 
     TrayMenuEntry {
         visible: !root.modelData?.isSeparator
+        rootMenu: root.rootMenu
         menuData: root.modelData
         Layout.fillWidth: true
         onInteracted: root.interacted()