modals: single window optimization

quickshell/Modals/Spotlight/SpotlightContent.qml

@@ -51,7 +51,21 @@ Item {
     anchors.fill: parent
     focus: true
     clip: false
+
+    onActiveFocusChanged: {
+        if (!activeFocus)
+            return;
+        if (!searchField)
+            return;
+        searchField.forceActiveFocus();
+    }
     Keys.onPressed: event => {
+        const menu = usePopupContextMenu ? popupContextMenu : layerContextMenuLoader.item;
+        if (menu?.visible) {
+            menu.handleKey(event);
+            return;
+        }
+
         if (event.key === Qt.Key_Escape) {
             if (parentModal)
                 parentModal.hide();
@@ -197,7 +211,6 @@ Item {
 
         parent: spotlightKeyHandler
         appLauncher: spotlightKeyHandler.appLauncher
-        parentHandler: spotlightKeyHandler
         searchField: spotlightKeyHandler.searchField
         visible: false
         z: 1000
@@ -218,8 +231,6 @@ Item {
         sourceComponent: Component {
             SpotlightContextMenu {
                 appLauncher: spotlightKeyHandler.appLauncher
-                parentHandler: spotlightKeyHandler
-                parentModal: spotlightKeyHandler.parentModal
             }
         }
     }
@@ -280,6 +291,12 @@ Item {
                     updateSearchMode();
                 }
                 Keys.onPressed: event => {
+                    const menu = spotlightKeyHandler.usePopupContextMenu ? popupContextMenu : layerContextMenuLoader.item;
+                    if (menu?.visible) {
+                        menu.handleKey(event);
+                        return;
+                    }
+
                     if (event.key === Qt.Key_Escape) {
                         if (parentModal)
                             parentModal.hide();
@@ -312,7 +329,7 @@ Item {
                 Row {
                     id: viewModeButtons
                     spacing: Theme.spacingXS
-                    visible: searchMode === "apps" && appLauncher.model.count > 0
+                    visible: searchMode === "apps"
                     anchors.right: parent.right
                     anchors.verticalCenter: parent.verticalCenter
 

quickshell/Modals/Spotlight/SpotlightContextMenu.qml

@@ -1,7 +1,6 @@
 import QtQuick
 import Quickshell
 import Quickshell.Wayland
-import Quickshell.Widgets
 import qs.Common
 import qs.Modals.Spotlight
 
@@ -11,54 +10,66 @@ PanelWindow {
     WlrLayershell.namespace: "dms:spotlight-context-menu"
     WlrLayershell.layer: WlrLayershell.Overlay
     WlrLayershell.exclusiveZone: -1
-    WlrLayershell.keyboardFocus: WlrKeyboardFocus.Exclusive
+    WlrLayershell.keyboardFocus: WlrKeyboardFocus.None
 
     property var appLauncher: null
-    property var parentHandler: null
-    property var parentModal: null
     property real menuPositionX: 0
     property real menuPositionY: 0
-    
+
     readonly property real shadowBuffer: 5
-    
-    screen: parentModal?.effectiveScreen
+
+    screen: DankModalWindow.targetScreen
 
     function show(x, y, app, fromKeyboard) {
         fromKeyboard = fromKeyboard || false;
         menuContent.currentApp = app;
-        
+
         let screenX = x;
         let screenY = y;
-        
-        if (parentModal) {
-            if (fromKeyboard) {
-                screenX = x + parentModal.alignedX;
-                screenY = y + parentModal.alignedY;
-            } else {
-                screenX = x + (parentModal.alignedX - shadowBuffer);
-                screenY = y + (parentModal.alignedY - shadowBuffer);
-            }
+
+        const modalX = DankModalWindow.modalX;
+        const modalY = DankModalWindow.modalY;
+
+        if (fromKeyboard) {
+            screenX = x + modalX;
+            screenY = y + modalY;
+        } else {
+            screenX = x + (modalX - shadowBuffer);
+            screenY = y + (modalY - shadowBuffer);
         }
-        
+
         menuPositionX = screenX;
         menuPositionY = screenY;
-        
+
         menuContent.selectedMenuIndex = fromKeyboard ? 0 : -1;
         menuContent.keyboardNavigation = true;
         visible = true;
-        
-        if (parentHandler) {
-            parentHandler.enabled = false;
+    }
+
+    function handleKey(event) {
+        switch (event.key) {
+        case Qt.Key_Down:
+            menuContent.selectNext();
+            event.accepted = true;
+            break;
+        case Qt.Key_Up:
+            menuContent.selectPrevious();
+            event.accepted = true;
+            break;
+        case Qt.Key_Return:
+        case Qt.Key_Enter:
+            menuContent.activateSelected();
+            event.accepted = true;
+            break;
+        case Qt.Key_Escape:
+        case Qt.Key_Menu:
+            hide();
+            event.accepted = true;
+            break;
         }
-        Qt.callLater(() => {
-            menuContent.keyboardHandler.forceActiveFocus();
-        });
     }
 
     function hide() {
-        if (parentHandler) {
-            parentHandler.enabled = true;
-        }
         visible = false;
     }
 
@@ -71,11 +82,6 @@ PanelWindow {
         bottom: true
     }
 
-    onVisibleChanged: {
-        if (!visible && parentHandler) {
-            parentHandler.enabled = true;
-        }
-    }
 
     SpotlightContextMenuContent {
         id: menuContent

quickshell/Modals/Spotlight/SpotlightContextMenuPopup.qml

@@ -8,51 +8,57 @@ Popup {
     id: root
 
     property var appLauncher: null
-    property var parentHandler: null
     property var searchField: null
 
     function show(x, y, app, fromKeyboard) {
         fromKeyboard = fromKeyboard || false;
         menuContent.currentApp = app;
-        
+
         root.x = x + 4;
         root.y = y + 4;
-        
+
         menuContent.selectedMenuIndex = fromKeyboard ? 0 : -1;
         menuContent.keyboardNavigation = true;
-        
-        if (parentHandler) {
-            parentHandler.enabled = false;
-        }
-        
+
         open();
     }
-    
-    onOpened: {
-        Qt.callLater(() => {
-            menuContent.keyboardHandler.forceActiveFocus();
-        });
+
+    function handleKey(event) {
+        switch (event.key) {
+        case Qt.Key_Down:
+            menuContent.selectNext();
+            event.accepted = true;
+            break;
+        case Qt.Key_Up:
+            menuContent.selectPrevious();
+            event.accepted = true;
+            break;
+        case Qt.Key_Return:
+        case Qt.Key_Enter:
+            menuContent.activateSelected();
+            event.accepted = true;
+            break;
+        case Qt.Key_Escape:
+        case Qt.Key_Menu:
+            hide();
+            event.accepted = true;
+            break;
+        }
     }
 
     function hide() {
-        if (parentHandler) {
-            parentHandler.enabled = true;
-        }
         close();
     }
 
     width: menuContent.implicitWidth
     height: menuContent.implicitHeight
     padding: 0
-    closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
+    closePolicy: Popup.CloseOnPressOutside
     modal: true
     dim: false
     background: Item {}
 
     onClosed: {
-        if (parentHandler) {
-            parentHandler.enabled = true;
-        }
         if (searchField) {
             Qt.callLater(() => {
                 searchField.forceActiveFocus();

quickshell/Modals/Spotlight/SpotlightModal.qml

@@ -1,20 +1,13 @@
 import QtQuick
-import Quickshell.Hyprland
 import Quickshell.Io
 import qs.Common
 import qs.Modals.Common
-import qs.Services
 
 DankModal {
     id: spotlightModal
 
     layerNamespace: "dms:spotlight"
 
-    HyprlandFocusGrab {
-        windows: [spotlightModal.contentWindow]
-        active: CompositorService.isHyprland && spotlightModal.shouldHaveFocus
-    }
-
     property bool spotlightOpen: false
     property alias spotlightContent: spotlightContentInstance
     property bool openedFromOverview: false
@@ -23,32 +16,18 @@ DankModal {
         openedFromOverview = false;
         spotlightOpen = true;
         open();
-
-        Qt.callLater(() => {
-            if (spotlightContent && spotlightContent.searchField) {
-                spotlightContent.searchField.forceActiveFocus();
-            }
-        });
     }
 
     function showWithQuery(query) {
         if (spotlightContent) {
-            if (spotlightContent.appLauncher) {
+            if (spotlightContent.appLauncher)
                 spotlightContent.appLauncher.searchQuery = query;
-            }
-            if (spotlightContent.searchField) {
+            if (spotlightContent.searchField)
                 spotlightContent.searchField.text = query;
-            }
         }
 
         spotlightOpen = true;
         open();
-
-        Qt.callLater(() => {
-            if (spotlightContent && spotlightContent.searchField) {
-                spotlightContent.searchField.forceActiveFocus();
-            }
-        });
     }
 
     function hide() {
@@ -57,23 +36,24 @@ DankModal {
         close();
     }
 
-    onDialogClosed: {
-        if (spotlightContent) {
-            if (spotlightContent.appLauncher) {
-                spotlightContent.appLauncher.searchQuery = "";
-                spotlightContent.appLauncher.selectedIndex = 0;
-                spotlightContent.appLauncher.setCategory(I18n.tr("All"));
-            }
-            if (spotlightContent.fileSearchController) {
-                spotlightContent.fileSearchController.reset();
-            }
-            if (spotlightContent.resetScroll) {
-                spotlightContent.resetScroll();
-            }
-            if (spotlightContent.searchField) {
-                spotlightContent.searchField.text = "";
-            }
+    function onFullyClosed() {
+        resetContent();
+    }
+
+    function resetContent() {
+        if (!spotlightContent)
+            return;
+        if (spotlightContent.appLauncher) {
+            spotlightContent.appLauncher.searchQuery = "";
+            spotlightContent.appLauncher.selectedIndex = 0;
+            spotlightContent.appLauncher.setCategory(I18n.tr("All"));
         }
+        if (spotlightContent.fileSearchController)
+            spotlightContent.fileSearchController.reset();
+        if (spotlightContent.resetScroll)
+            spotlightContent.resetScroll();
+        if (spotlightContent.searchField)
+            spotlightContent.searchField.text = "";
     }
 
     function toggle() {
@@ -94,16 +74,10 @@ DankModal {
     enableShadow: true
     keepContentLoaded: true
     onVisibleChanged: () => {
-        if (visible && !spotlightOpen) {
+        if (!visible)
+            return;
+        if (!spotlightOpen)
             show();
-        }
-        if (visible && spotlightContent) {
-            Qt.callLater(() => {
-                if (spotlightContent.searchField) {
-                    spotlightContent.searchField.forceActiveFocus();
-                }
-            });
-        }
     }
     onBackgroundClicked: () => {
         return hide();