diff --git a/shell/bar/Bar.qml b/shell/bar/Bar.qml index 5782c55..85c220d 100644 --- a/shell/bar/Bar.qml +++ b/shell/bar/Bar.qml @@ -1,7 +1,7 @@ import QtQuick import QtQuick.Layouts import Quickshell -// import "power" +import "power" // import "volume" import "systray" // import qs.widgets @@ -55,6 +55,11 @@ Variants { } } + // PowerMenu { + // bar: root + // Layout.fillHeight: true + // } + // Right side of bar RowLayout { spacing: 10 diff --git a/shell/bar/Popup.qml b/shell/bar/Popup.qml index d960e9f..f8dada8 100644 --- a/shell/bar/Popup.qml +++ b/shell/bar/Popup.qml @@ -89,22 +89,21 @@ Scope { active: true windows: [popup, root.bar] onCleared: { - root.shownItem.closed(); + if (!active) { + root.shownItem.closed(); + } } } // HyprlandWindow.opacity: root.scaleMul - HyprlandWindow.visibleMask: Region { - id: mask - item: parentItem - } + HyprlandWindow.visibleMask: popup.mask Connections { target: root function onScaleMulChanged() { - mask.changed(); + popup.mask.changed(); } }