internal: centralise focus grabs

Except detached popouts focus grab (its meant to be exclusive to the other grab)

4 files changed, 6 insertions, 18 deletions

diff --git a/modules/bar/popouts/TrayMenu.qml b/modules/bar/popouts/TrayMenu.qml
index 02c76d2..c87c0e1 100644
--- a/modules/bar/popouts/TrayMenu.qml
+++ b/modules/bar/popouts/TrayMenu.qml
@@ -5,7 +5,6 @@ import qs.services
 import qs.config
 import Quickshell
 import Quickshell.Widgets
-import Quickshell.Hyprland
 import QtQuick
 import QtQuick.Controls
 
@@ -27,12 +26,6 @@ StackView {
     popEnter: NoAnim {}
     popExit: NoAnim {}
 
-    HyprlandFocusGrab {
-        active: root.depth > 1
-        windows: [QsWindow.window]
-        onCleared: root.popouts.hasCurrent = false
-    }
-
     component NoAnim: Transition {
         NumberAnimation {
             duration: 0
diff --git a/modules/dashboard/Wrapper.qml b/modules/dashboard/Wrapper.qml
index 9c92695..0e37909 100644
--- a/modules/dashboard/Wrapper.qml
+++ b/modules/dashboard/Wrapper.qml
@@ -6,7 +6,6 @@ import qs.config
 import qs.utils
 import Caelestia
 import Quickshell
-import Quickshell.Hyprland
 import QtQuick
 
 Item {
@@ -77,12 +76,6 @@ Item {
         }
     ]
 
-    HyprlandFocusGrab {
-        active: !Config.dashboard.showOnHover && root.visibilities.dashboard && Config.dashboard.enabled
-        windows: [QsWindow.window]
-        onCleared: root.visibilities.dashboard = false
-    }
-
     Timer {
         id: timer
 
diff --git a/modules/drawers/Drawers.qml b/modules/drawers/Drawers.qml
index 3a6c646..61644a3 100644
--- a/modules/drawers/Drawers.qml
+++ b/modules/drawers/Drawers.qml
@@ -40,7 +40,7 @@ Variants {
             WlrLayershell.exclusionMode: ExclusionMode.Ignore
             WlrLayershell.keyboardFocus: visibilities.launcher || visibilities.session ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
 
-            mask: focusGrab.active || Hypr.focusedMonitor?.activeWorkspace?.lastIpcObject.windows > 0 ? inputMask : null
+            mask: focusGrab.active || panels.popouts.isDetached || Hypr.focusedMonitor?.activeWorkspace?.lastIpcObject.windows > 0 ? inputMask : null
 
             anchors.top: true
             anchors.bottom: true
@@ -78,12 +78,14 @@ Variants {
             HyprlandFocusGrab {
                 id: focusGrab
 
-                active: (visibilities.launcher && Config.launcher.enabled) || (visibilities.session && Config.session.enabled) || (visibilities.sidebar && Config.sidebar.enabled)
+                active: (visibilities.launcher && Config.launcher.enabled) || (visibilities.session && Config.session.enabled) || (visibilities.sidebar && Config.sidebar.enabled) || (!Config.dashboard.showOnHover && visibilities.dashboard && Config.dashboard.enabled) || (panels.popouts.currentName.startsWith("traymenu") && panels.popouts.current?.depth > 1)
                 windows: [win]
                 onCleared: {
                     visibilities.launcher = false;
                     visibilities.session = false;
                     visibilities.sidebar = false;
+                    visibilities.dashboard = false;
+                    panels.popouts.hasCurrent = false;
                 }
             }
 
diff --git a/modules/drawers/Interactions.qml b/modules/drawers/Interactions.qml
index 84714b5..56e2d6b 100644
--- a/modules/drawers/Interactions.qml
+++ b/modules/drawers/Interactions.qml
@@ -68,7 +68,7 @@ CustomMouseArea {
             if (!utilitiesShortcutActive)
                 visibilities.utilities = false;
 
-            if (!popouts.currentName.startsWith("traymenu") || popouts.current?.depth <= 1)
+            if (!popouts.currentName.startsWith("traymenu") || (popouts.current?.depth ?? 0) <= 1)
                 popouts.hasCurrent = false;
 
             if (Config.bar.showOnHover)
@@ -199,7 +199,7 @@ CustomMouseArea {
         // Show popouts on hover
         if (x < bar.implicitWidth)
             bar.checkPopout(y);
-        else if (!popouts.currentName.startsWith("traymenu") && !inLeftPanel(panels.popouts, x, y))
+        else if ((!popouts.currentName.startsWith("traymenu") || (popouts.current?.depth ?? 0) <= 1) && !inLeftPanel(panels.popouts, x, y))
             popouts.hasCurrent = false;
     }