hyprland: general focus fixes related to #2561

core/internal/config/embedded/hyprland.lua

@@ -13,6 +13,7 @@ hl.config({
 	input = {
 		kb_layout = "us",
 		numlock_by_default = true,
+		follow_mouse = 0,
 		touchpad = {
 			tap_to_click = true,
 			natural_scroll = true,

quickshell/Common/KeyboardFocus.qml

@@ -25,6 +25,16 @@ Singleton {
         return CompositorService.useHyprlandFocusGrab && keyboardFocus(active, customFocus) === WlrKeyboardFocus.OnDemand;
     }
 
+    function captureActiveToplevel() {
+        return ToplevelManager.activeToplevel;
+    }
+
+    function restoreToplevel(toplevel) {
+        if (toplevel)
+            Qt.callLater(() => toplevel.activate());
+        return null;
+    }
+
     property list<var> barWindows: []
 
     function registerBarWindow(window) {

quickshell/Modals/Common/DankModal.qml

@@ -58,6 +58,9 @@ Item {
     HyprlandFocusGrab {
         windows: root.contentWindow ? [root.contentWindow] : []
         active: KeyboardFocus.wantsGrab(root.shouldHaveFocus, root.customKeyboardFocus)
+
+        property var restoreToplevel: null
+        onActiveChanged: restoreToplevel = active ? KeyboardFocus.captureActiveToplevel() : KeyboardFocus.restoreToplevel(restoreToplevel)
     }
     readonly property var contentWindow: impl.item ? impl.item.contentWindow : null
     readonly property var effectiveScreen: impl.item ? impl.item.effectiveScreen : null

quickshell/Modules/DankBar/Widgets/SystemTrayBar.qml

@@ -1051,6 +1051,9 @@ BasePill {
         HyprlandFocusGrab {
             windows: [overflowMenu].concat(KeyboardFocus.barWindows)
             active: root.useOverflowPopup && KeyboardFocus.wantsGrab(root.menuOpen, null)
+
+            property var restoreToplevel: null
+            onActiveChanged: restoreToplevel = active ? KeyboardFocus.captureActiveToplevel() : KeyboardFocus.restoreToplevel(restoreToplevel)
         }
 
         Connections {
@@ -1595,6 +1598,9 @@ BasePill {
                 HyprlandFocusGrab {
                     windows: [menuWindow].concat(KeyboardFocus.barWindows)
                     active: KeyboardFocus.wantsGrab(menuRoot.showMenu, null)
+
+                    property var restoreToplevel: null
+                    onActiveChanged: restoreToplevel = active ? KeyboardFocus.captureActiveToplevel() : KeyboardFocus.restoreToplevel(restoreToplevel)
                 }
 
                 anchors {

quickshell/Widgets/DankPopout.qml

@@ -65,7 +65,10 @@ Item {
                 list.push(root.backgroundWindow);
             return list.concat(KeyboardFocus.barWindows);
         }
-        active: KeyboardFocus.wantsGrab(root.shouldBeVisible || root.isClosing, root.customKeyboardFocus)
+        active: KeyboardFocus.wantsGrab(root.shouldBeVisible, root.customKeyboardFocus)
+
+        property var restoreToplevel: null
+        onActiveChanged: restoreToplevel = active ? KeyboardFocus.captureActiveToplevel() : KeyboardFocus.restoreToplevel(restoreToplevel)
     }
 
     Loader {

quickshell/Widgets/DankPopoutConnected.qml

@@ -965,7 +965,7 @@ Item {
         WlrLayershell.namespace: root.layerNamespace
         WlrLayershell.layer: root.effectivePopoutLayer
         WlrLayershell.exclusiveZone: -1
-        WlrLayershell.keyboardFocus: KeyboardFocus.keyboardFocus(shouldBeVisible || (isClosing && CompositorService.useHyprlandFocusGrab), customKeyboardFocus)
+        WlrLayershell.keyboardFocus: KeyboardFocus.keyboardFocus(shouldBeVisible, customKeyboardFocus)
 
         readonly property bool _fullHeight: root.fullHeightSurface
         anchors {

quickshell/Widgets/DankPopoutStandalone.qml

@@ -636,7 +636,7 @@ Item {
         WlrLayershell.namespace: root.layerNamespace
         WlrLayershell.layer: root.effectivePopoutLayer
         WlrLayershell.exclusiveZone: -1
-        WlrLayershell.keyboardFocus: KeyboardFocus.keyboardFocus(shouldBeVisible || (isClosing && CompositorService.useHyprlandFocusGrab), customKeyboardFocus)
+        WlrLayershell.keyboardFocus: KeyboardFocus.keyboardFocus(shouldBeVisible, customKeyboardFocus)
 
         anchors {
             left: true