From 921281747be48206178acb72bb0fc1fb542d1d78 Mon Sep 17 00:00:00 2001
From: Chintan Patel <216989679+Chintanpatel24@users.noreply.github.com>
Date: Thu, 15 Oct 2026 15:09:08 +0530
Subject: [PATCH] fix(launcher): allow Qt Quick active focus on layer surfaces
 and clean stale user quickshell on install

---
 quickshell/agility/Core/Windows/OverlayWindow.qml          | 1 -
 quickshell/agility/Modules/Bar/BarOverlayWindow.qml        | 1 -
 .../agility/Modules/Bar/Styles/Convex/ConvexDesktop.qml    | 1 -
 .../agility/Modules/Bar/Styles/Gaming/GamingOverlay.qml    | 1 -
 scripts/install.sh                                         | 7 +++++++
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/quickshell/agility/Core/Windows/OverlayWindow.qml b/quickshell/agility/Core/Windows/OverlayWindow.qml
index 47961ebc..c0f528ac 100644
--- a/quickshell/agility/Core/Windows/OverlayWindow.qml
+++ b/quickshell/agility/Core/Windows/OverlayWindow.qml
@@ -70,7 +70,6 @@ PanelWindow {
     color: "transparent"
     WlrLayershell.layer: WlrLayer.Top
     WlrLayershell.keyboardFocus: (root.isOpen && root.windowFocusable) ? WlrKeyboardFocus.Exclusive : WlrKeyboardFocus.None
-    focusable: false
     exclusionMode: ExclusionMode.Ignore
     visible: _windowVisible || forceVisible || (styleLoader.item && styleLoader.item.isHandover)
     onIsOpenChanged: {
diff --git a/quickshell/agility/Modules/Bar/BarOverlayWindow.qml b/quickshell/agility/Modules/Bar/BarOverlayWindow.qml
index 6b363e0d..8f1cc3a1 100644
--- a/quickshell/agility/Modules/Bar/BarOverlayWindow.qml
+++ b/quickshell/agility/Modules/Bar/BarOverlayWindow.qml
@@ -84,7 +84,6 @@ PanelWindow {
     WlrLayershell.exclusionMode: ExclusionMode.Ignore
     WlrLayershell.keyboardFocus: needsFocus ? WlrKeyboardFocus.Exclusive : WlrKeyboardFocus.None
     color: "transparent"
-    focusable: false
     Component.onCompleted: {
         activeBarStyle = SettingsService.barStyle;
     }
diff --git a/quickshell/agility/Modules/Bar/Styles/Convex/ConvexDesktop.qml b/quickshell/agility/Modules/Bar/Styles/Convex/ConvexDesktop.qml
index b303ec33..c5665137 100644
--- a/quickshell/agility/Modules/Bar/Styles/Convex/ConvexDesktop.qml
+++ b/quickshell/agility/Modules/Bar/Styles/Convex/ConvexDesktop.qml
@@ -38,7 +38,6 @@ PanelWindow {
     WlrLayershell.layer: WlrLayer.Top
     WlrLayershell.exclusionMode: ExclusionMode.Ignore
     WlrLayershell.keyboardFocus: needsFocus ? WlrKeyboardFocus.Exclusive : WlrKeyboardFocus.None
-    focusable: false
     onNeedsFocusChanged: {
         if (needsFocus && convexPanels && convexPanels.bottomDrawer) {
             convexPanels.bottomDrawer.activateCurrentItem();
diff --git a/quickshell/agility/Modules/Bar/Styles/Gaming/GamingOverlay.qml b/quickshell/agility/Modules/Bar/Styles/Gaming/GamingOverlay.qml
index e51b6050..47cd73a2 100644
--- a/quickshell/agility/Modules/Bar/Styles/Gaming/GamingOverlay.qml
+++ b/quickshell/agility/Modules/Bar/Styles/Gaming/GamingOverlay.qml
@@ -97,7 +97,6 @@ PanelWindow {
     WlrLayershell.layer: WlrLayer.Top
     WlrLayershell.exclusionMode: ExclusionMode.Ignore
     WlrLayershell.keyboardFocus: needsFocus ? WlrKeyboardFocus.Exclusive : WlrKeyboardFocus.None
-    focusable: false
     color: "transparent"
     visible: SettingsService.settingsLoaded && DisplayProfileService.gameModeActive && root.hasAnyOpen
     onIsLauncherChanged: {
diff --git a/scripts/install.sh b/scripts/install.sh
index d5276b69..3ecfd658 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -852,6 +852,13 @@ seed_user_configuration() {
             info "Migrated startup command in existing niri.kdl while preserving all custom keybindings."
         fi
     fi
+
+    # Clean up obsolete quickshell runtime code tree in user config to avoid shadowing system-wide /usr/share/agility-shell
+    if [[ -d "$USER_CONFIG/quickshell" ]]; then
+        info "Cleaning obsolete local quickshell code tree from $USER_CONFIG/quickshell..."
+        rm -rf "$USER_CONFIG/quickshell"
+    fi
+
     success "User configuration initialized."
 }