simplify StyledPopupWindow

components/StyledLayoutSeparator.qml

@@ -1,12 +0,0 @@
-import qs.config
-import QtQuick
-import QtQuick.Layouts
-
-Rectangle {
-    color: Styling.theme.basecontent
-    opacity: 0.33
-    Layout.fillHeight: true
-    Layout.margins: 2
-    implicitWidth: 0.5
-    radius: 9999
-}

components/StyledPopupWindow.qml

@@ -1,79 +1,70 @@
-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 {
-        NumberAnimation {
-            duration: 100
-        }
-    }
-    implicitHeight: background.height
-    Behavior on implicitHeight {
-        NumberAnimation {
-            duration: 100
-        }
-    }
-
-    Timer {
-        id: timer
-        interval: 750
-        onTriggered: {
-            if (!root.visible) {
-                return;
-            }
-            root.toggle();
-        }
-    }
-
-    WrapperMouseArea {
-        hoverEnabled: true
-        onExited: {
-            timer.start();
-        }
-        onEntered: {
-            timer.stop();
-        }
-        WrapperRectangle {
         id: background
 
-            opacity: 0
+        margin: 16
-            Behavior on opacity {
+        focus: true
-                NumberAnimation {
+        onFocusChanged: {
-                    duration: root.animationDuration
+            if (!focus) {
+                grab.active = false;
             }
         }
 
-            states: State {
+        Behavior on opacity {
+            NumberAnimation {
+                duration: Styling.animations.speed.normal
+            }
+        }
+
+        state: "closed"
+        states: [
+            State {
+                name: "closed"
+                PropertyChanges {
+                    background {
+                        opacity: 0
+                    }
+                }
+            },
+            State {
                 name: "opened"
-                when: root.opened
                 PropertyChanges {
                     background {
                         opacity: 1
                     }
                 }
             }
+        ]
 
         transitions: [
             Transition {
-                    from: ""
+                from: "closed"
                 to: "opened"
                 ScriptAction {
                     script: root.visible = true
@@ -81,7 +72,7 @@ PopupWindow {
             },
             Transition {
                 from: "opened"
-                    to: ""
+                to: "closed"
                 SequentialAnimation {
                     PauseAnimation {
                         duration: root.animationDuration
@@ -98,5 +89,4 @@ PopupWindow {
             sourceComponent: root.content
         }
     }
-    }
 }

modules/bar/Bar.qml

@@ -28,7 +28,7 @@ StyledWrapperRectangle {
         RowLayout {
             id: leftbar
 
-            spacing: Styling.layout.spacing.lg
+            spacing: Styling.layout.spacing.base
 
             SystemLogo {
                 implicitSize: 22
@@ -44,7 +44,7 @@ StyledWrapperRectangle {
 
             Layout.alignment: Qt.AlignHCenter
 
-            spacing: Styling.layout.spacing.lg
+            spacing: Styling.layout.spacing.base
 
             Mpris {}
         }
@@ -54,14 +54,18 @@ StyledWrapperRectangle {
 
             Layout.alignment: Qt.AlignRight
 
-            spacing: Styling.layout.spacing.lg
+            spacing: Styling.layout.spacing.base
+
+            Pywal {}
 
             Pipewire {}
 
-            StyledLayoutSeparator {}
+            Caffeine {}
 
             Network {}
 
+            Bluetooth {}
+
             Storage {}
 
             Memory {}
@@ -70,20 +74,10 @@ StyledWrapperRectangle {
 
             Gpu {}
 
-            StyledLayoutSeparator {}
+            Power {}
-
-            Pywal {}
-
-            Caffeine {}
-
-            Bluetooth {}
-
-            StyledLayoutSeparator {}
 
             Clock {}
 
-            Power {}
-
             Notifications {}
         }
     }

modules/bar/components/Caffeine.qml

@@ -6,7 +6,7 @@ StyledIconButton {
     id: root
 
     border.width: 2
-    border.color: Caffeine.enabled ? Styling.theme.secondary : root.hovered ? Styling.theme.primary : Styling.theme.base200
+    border.color: Caffeine.enabled ? Styling.theme.secondary : root.hovered ? Styling.theme.primary : Styling.theme.base300
     text: Styling.lucide.icons.coffee
 
     onClicked: {

modules/bar/components/Clock.qml

@@ -1,10 +1,12 @@
 import qs.components
 import Quickshell
 
-StyledText {
+StyledRectangle {
+    StyledText {
         text: ` ${Qt.formatDateTime(clock.date, "hh:mm:ss AP")}`
         SystemClock {
             id: clock
             precision: SystemClock.Seconds
         }
+    }
 }

modules/bar/components/Memory.qml

@@ -5,7 +5,9 @@ import qs.utils
 import QtQuick
 import QtQuick.Layouts
 
-RowLayout {
+StyledRectangle {
+
+    RowLayout {
 
         Ref {
             service: SystemInfo
@@ -18,4 +20,5 @@ RowLayout {
         StyledText {
             text: ` ${(SystemInfo.memPerc * 100).toFixed()}%`
         }
+    }
 }

modules/bar/components/Network.qml

@@ -5,7 +5,9 @@ import qs.utils
 import QtQuick
 import QtQuick.Layouts
 
-RowLayout {
+StyledRectangle {
+
+    RowLayout {
 
         Ref {
             service: NetworkService
@@ -49,4 +51,5 @@ RowLayout {
             id: text
             text: ` ${(NetworkService.active?.strength ?? 0).toFixed()}%`
         }
+    }
 }

modules/bar/components/Storage.qml

@@ -5,7 +5,9 @@ import qs.utils
 import QtQuick
 import QtQuick.Layouts
 
-RowLayout {
+StyledRectangle {
+
+    RowLayout {
 
         Ref {
             service: SystemInfo
@@ -20,4 +22,5 @@ RowLayout {
 
             text: ` ${(SystemInfo.storagePerc * 100).toFixed()}%`
         }
+    }
 }

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