simplify StyledPopupWindow

components/StyledPopupWindow.qml

@@ -1,102 +1,92 @@
-import qs.services
+import qs.config
 import QtQuick
 import Quickshell
-import Quickshell.Widgets
+import Quickshell.Hyprland
 
 PopupWindow {
     id: root
-    property bool opened: false
+
-    property int animationDuration: 200
-    property alias margins: background.margin
-    property alias backgroundColor: background.color
-    property alias radius: background.radius
-    property alias state: background.state
     required property Component content
 
+    implicitWidth: background.width
+    implicitHeight: background.height
     color: "transparent"
 
+    HyprlandFocusGrab {
+        id: grab
+        active: root.visible
+        windows: [root]
+        onCleared: {
+            background.state = "closed";
+        }
+    }
+
     function toggle() {
-        Visibility.togglePopup(this);
+        background.state = background.state == "opened" ? "closed" : "opened";
     }
 
-    implicitWidth: background.width
+    StyledWrapperRectangle {
-    Behavior on implicitWidth {
+        id: background
-        NumberAnimation {
-            duration: 100
-        }
-    }
-    implicitHeight: background.height
-    Behavior on implicitHeight {
-        NumberAnimation {
-            duration: 100
-        }
-    }
 
-    Timer {
+        margin: 16
-        id: timer
+        focus: true
-        interval: 750
+        onFocusChanged: {
-        onTriggered: {
+            if (!focus) {
-            if (!root.visible) {
+                grab.active = false;
-                return;
             }
-            root.toggle();
         }
-    }
 
-    WrapperMouseArea {
+        Behavior on opacity {
-        hoverEnabled: true
+            NumberAnimation {
-        onExited: {
+                duration: Styling.animations.speed.normal
-            timer.start();
+            }
         }
-        onEntered: {
-            timer.stop();
-        }
-        WrapperRectangle {
-            id: background
 
-            opacity: 0
+        state: "closed"
-            Behavior on opacity {
+        states: [
-                NumberAnimation {
+            State {
-                    duration: root.animationDuration
+                name: "closed"
+                PropertyChanges {
+                    background {
+                        opacity: 0
+                    }
                 }
-            }
+            },
-
+            State {
-            states: State {
                 name: "opened"
-                when: root.opened
                 PropertyChanges {
                     background {
                         opacity: 1
                     }
                 }
             }
+        ]
 
-            transitions: [
+        transitions: [
-                Transition {
+            Transition {
-                    from: ""
+                from: "closed"
-                    to: "opened"
+                to: "opened"
-                    ScriptAction {
+                ScriptAction {
-                        script: root.visible = true
+                    script: root.visible = true
+                }
+            },
+            Transition {
+                from: "opened"
+                to: "closed"
+                SequentialAnimation {
+                    PauseAnimation {
+                        duration: root.animationDuration
                     }
-                },
+                    ScriptAction {
-                Transition {
+                        script: root.visible = false
-                    from: "opened"
-                    to: ""
-                    SequentialAnimation {
-                        PauseAnimation {
-                            duration: root.animationDuration
-                        }
-                        ScriptAction {
-                            script: root.visible = false
-                        }
                     }
                 }
-            ]
-
-            Loader {
-                active: root.visible
-                sourceComponent: root.content
             }
+        ]
+
+        Loader {
+            active: root.visible
+            sourceComponent: root.content
         }
     }
 }

modules/bar/components/bluetooth/BluetoothMenu.qml

@@ -1,7 +1,6 @@
 pragma ComponentBehavior: Bound
 
 import qs.components
-import qs.config
 import QtQuick
 import QtQuick.Layouts
 import Quickshell
@@ -10,10 +9,6 @@ import Quickshell.Bluetooth
 StyledPopupWindow {
     id: root
 
-    backgroundColor: Styling.theme.base300
-    margins: 16
-    radius: 8
-
     content: ColumnLayout {
         spacing: 8
         StyledWrapperRectangle {

modules/bar/components/notifications/NotificationMenu.qml

@@ -9,10 +9,6 @@ import QtQuick.Layouts
 StyledPopupWindow {
     id: root
 
-    backgroundColor: Styling.theme.base300
-    margins: 16
-    radius: 8
-
     content: GridLayout {
 
         columns: 2

modules/bar/components/tray/menu/Menu.qml

@@ -9,10 +9,6 @@ import Quickshell
 StyledPopupWindow {
     id: window
 
-    backgroundColor: Styling.theme.base300
-    margins: 14
-    radius: 8
-
     property QsMenuOpener menuOpener
 
     content: ColumnLayout {

services/Visibility.qml

@@ -1,6 +1,5 @@
 pragma Singleton
 
-import qs.components
 import Quickshell
 
 Singleton {
@@ -9,15 +8,6 @@ Singleton {
     property alias pomodoro: properties.pomodoro
     property alias powermenu: properties.powermenu
     property alias storybook: properties.storybook
-    property StyledPopupWindow activePopup
-
-    function togglePopup(popup: StyledPopupWindow) {
-        if (activePopup && popup != activePopup) {
-            activePopup.state = "";
-        }
-        popup.state = popup.state == "opened" ? "" : "opened";
-        activePopup = popup;
-    }
 
     PersistentProperties {
         id: properties