hyprland: fix focus grab

2026-01-24 21:42:51 -05:00 · 2025-11-26 12:46:19 -05:00
parent 039c98b9e3
commit d7b39634e6
9 changed files with 10 additions and 8 deletions
--- a/quickshell/Modals/BluetoothPairingModal.qml
+++ b/quickshell/Modals/BluetoothPairingModal.qml
@@ -11,7 +11,7 @@ DankModal {
    layerNamespace: "dms:bluetooth-pairing"

    HyprlandFocusGrab {
-        windows: [root]
+        windows: [root.contentWindow]
        active: CompositorService.isHyprland && root.shouldHaveFocus
    }

--- a/quickshell/Modals/Clipboard/ClipboardHistoryModal.qml
+++ b/quickshell/Modals/Clipboard/ClipboardHistoryModal.qml
@@ -14,7 +14,7 @@ DankModal {
    layerNamespace: "dms:clipboard"

    HyprlandFocusGrab {
-        windows: [clipboardHistoryModal]
+        windows: [clipboardHistoryModal.contentWindow]
        active: CompositorService.isHyprland && clipboardHistoryModal.shouldHaveFocus
    }

--- a/quickshell/Modals/Common/DankModal.qml
+++ b/quickshell/Modals/Common/DankModal.qml
@@ -44,6 +44,8 @@ Item {
    property bool keepContentLoaded: false
    property bool keepPopoutsOpen: false
    property var customKeyboardFocus: null
+    readonly property alias contentWindow: contentWindow
+    readonly property alias backgroundWindow: backgroundWindow

    signal opened
    signal dialogClosed
--- a/quickshell/Modals/DankColorPickerModal.qml
+++ b/quickshell/Modals/DankColorPickerModal.qml
@@ -12,7 +12,7 @@ DankModal {
    layerNamespace: "dms:color-picker"

    HyprlandFocusGrab {
-        windows: [root]
+        windows: [root.contentWindow]
        active: CompositorService.isHyprland && root.shouldHaveFocus
    }

--- a/quickshell/Modals/NotificationModal.qml
+++ b/quickshell/Modals/NotificationModal.qml
@@ -12,7 +12,7 @@ DankModal {
    layerNamespace: "dms:notification-center-modal"

    HyprlandFocusGrab {
-        windows: [notificationModal]
+        windows: [notificationModal.contentWindow]
        active: CompositorService.isHyprland && notificationModal.shouldHaveFocus
    }

--- a/quickshell/Modals/PolkitAuthModal.qml
+++ b/quickshell/Modals/PolkitAuthModal.qml
@@ -11,7 +11,7 @@ DankModal {
    layerNamespace: "dms:polkit"

    HyprlandFocusGrab {
-        windows: [root]
+        windows: [root.contentWindow]
        active: CompositorService.isHyprland && root.shouldHaveFocus
    }

--- a/quickshell/Modals/PowerMenuModal.qml
+++ b/quickshell/Modals/PowerMenuModal.qml
@@ -14,7 +14,7 @@ DankModal {
    keepPopoutsOpen: true

    HyprlandFocusGrab {
-        windows: [root]
+        windows: [root.contentWindow]
        active: CompositorService.isHyprland && root.shouldHaveFocus
    }

--- a/quickshell/Modals/Spotlight/SpotlightModal.qml
+++ b/quickshell/Modals/Spotlight/SpotlightModal.qml
@@ -11,7 +11,7 @@ DankModal {
    layerNamespace: "dms:spotlight"

    HyprlandFocusGrab {
-        windows: [spotlightModal]
+        windows: [spotlightModal.contentWindow]
        active: CompositorService.isHyprland && spotlightModal.shouldHaveFocus
    }

--- a/quickshell/Modals/WifiPasswordModal.qml
+++ b/quickshell/Modals/WifiPasswordModal.qml
@@ -12,7 +12,7 @@ DankModal {
    keepPopoutsOpen: true

    HyprlandFocusGrab {
-        windows: [root]
+        windows: [root.contentWindow]
        active: CompositorService.isHyprland && root.shouldHaveFocus
    }