From 10491f23627a597ffa3dbabbd99b120064f5ebcc Mon Sep 17 00:00:00 2001
From: end-4 <97237370+end-4@users.noreply.github.com>
Date: Sat, 7 Feb 2026 09:46:31 +0100
Subject: [PATCH] kb focus fix from main

---
 .../quickshell/ii/modules/ii/overview/Overview.qml     |  2 +-
 .../ii/modules/ii/sidebarRight/SidebarRight.qml        |  3 +--
 .../modules/ii/wallpaperSelector/WallpaperSelector.qml |  1 +
 .../.config/quickshell/ii/services/GlobalFocusGrab.qml | 10 +++++++++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/dots/.config/quickshell/ii/modules/ii/overview/Overview.qml b/dots/.config/quickshell/ii/modules/ii/overview/Overview.qml
index d94404721..fe3df64a3 100644
--- a/dots/.config/quickshell/ii/modules/ii/overview/Overview.qml
+++ b/dots/.config/quickshell/ii/modules/ii/overview/Overview.qml
@@ -24,7 +24,7 @@ Scope {
 
         WlrLayershell.namespace: "quickshell:overview"
         WlrLayershell.layer: WlrLayer.Top
-        // WlrLayershell.keyboardFocus: GlobalStates.overviewOpen ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
+        WlrLayershell.keyboardFocus: GlobalStates.overviewOpen ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
         color: "transparent"
 
         mask: Region {
diff --git a/dots/.config/quickshell/ii/modules/ii/sidebarRight/SidebarRight.qml b/dots/.config/quickshell/ii/modules/ii/sidebarRight/SidebarRight.qml
index 69bc07c03..73620241b 100644
--- a/dots/.config/quickshell/ii/modules/ii/sidebarRight/SidebarRight.qml
+++ b/dots/.config/quickshell/ii/modules/ii/sidebarRight/SidebarRight.qml
@@ -22,8 +22,7 @@ Scope {
         exclusiveZone: 0
         implicitWidth: sidebarWidth
         WlrLayershell.namespace: "quickshell:sidebarRight"
-        // Hyprland 0.49: Focus is always exclusive and setting this breaks mouse focus grab
-        // WlrLayershell.keyboardFocus: WlrKeyboardFocus.Exclusive
+        WlrLayershell.keyboardFocus: GlobalStates.sidebarRightOpen ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
         color: "transparent"
 
         anchors {
diff --git a/dots/.config/quickshell/ii/modules/ii/wallpaperSelector/WallpaperSelector.qml b/dots/.config/quickshell/ii/modules/ii/wallpaperSelector/WallpaperSelector.qml
index 5bd79b56b..9d9ba9008 100644
--- a/dots/.config/quickshell/ii/modules/ii/wallpaperSelector/WallpaperSelector.qml
+++ b/dots/.config/quickshell/ii/modules/ii/wallpaperSelector/WallpaperSelector.qml
@@ -25,6 +25,7 @@ Scope {
             exclusionMode: ExclusionMode.Ignore
             WlrLayershell.namespace: "quickshell:wallpaperSelector"
             WlrLayershell.layer: WlrLayer.Overlay
+            WlrLayershell.keyboardFocus: WlrKeyboardFocus.OnDemand
             color: "transparent"
 
             anchors.top: true
diff --git a/dots/.config/quickshell/ii/services/GlobalFocusGrab.qml b/dots/.config/quickshell/ii/services/GlobalFocusGrab.qml
index 547d79e17..6385d3df7 100644
--- a/dots/.config/quickshell/ii/services/GlobalFocusGrab.qml
+++ b/dots/.config/quickshell/ii/services/GlobalFocusGrab.qml
@@ -52,9 +52,17 @@ Singleton {
         }
     }
 
+    function hasActive(element) {
+        return element?.activeFocus || Array.from(
+            element?.children
+        ).some(
+            (child) => hasActive(child)
+        );
+    }
+
     HyprlandFocusGrab {
         id: grab
-        windows: [...root.persistent, ...root.dismissable]
+        windows: root.dismissable.every(w => !w?.focusable) || root.dismissable.some(w => hasActive(w?.contentItem)) ? [...root.dismissable, ...root.persistent] : [...root.dismissable]
         active: root.dismissable.length > 0
         onCleared: () => {
             root.dismiss();