feat(niri): close overview on window focus (#3030)

* feat(niri): close overview on window focus

* feat(niri): close overview on window focus

---------

Co-authored-by: bbedward <[email protected]>

quickshell/Modules/Dock/DockAppButton.qml

@@ -182,7 +182,7 @@ Item {
             return false;
 
         HyprlandService.toggleSpecial(specialName);
-        Qt.callLater(() => waylandToplevel.activate());
+        Qt.callLater(() => CompositorService.activateToplevel(waylandToplevel));
         return true;
     }
 

quickshell/Modules/Settings/CompositorLayoutTab.qml

@@ -285,6 +285,24 @@ awk '$1 == "xray" { print FILENAME ":" FNR; exit }' $files 2>/dev/null`;
                 }
             }
 
+            SettingsCard {
+                width: parent.width
+                tags: ["niri", "overview", "window", "focus", "launch", "launcher", "dock", "settings"]
+                title: I18n.tr("Overview")
+                settingKey: "niriOverview"
+                iconName: "overview"
+                visible: CompositorService.isNiri
+
+                SettingsToggleRow {
+                    tags: ["niri", "overview", "window", "focus", "launch", "launcher", "dock", "settings"]
+                    settingKey: "closeNiriOverviewOnWindowFocus"
+                    text: I18n.tr("Close Niri Overview on Window Focus", "Niri setting to leave Niri overview when DMS launches or focuses a window")
+                    description: I18n.tr("Auto-close Niri overview when DMS launches or focuses a window.", "Description of the close Niri overview on window focus setting")
+                    checked: SettingsData.closeNiriOverviewOnWindowFocus
+                    onToggled: checked => SettingsData.set("closeNiriOverviewOnWindowFocus", checked)
+                }
+            }
+
             SettingsCard {
                 width: parent.width
                 tags: ["niri", "layout", "gaps", "radius", "window", "border"]

quickshell/Modules/Settings/LauncherTab.qml

@@ -777,15 +777,6 @@ Item {
                 title: I18n.tr("Niri Integration").replace("Niri", "niri")
                 visible: CompositorService.isNiri
 
-                SettingsToggleRow {
-                    settingKey: "spotlightCloseNiriOverview"
-                    tags: ["launcher", "niri", "overview", "close", "launch"]
-                    text: I18n.tr("Close Overview on Launch")
-                    description: I18n.tr("Auto-close Niri overview when launching apps.")
-                    checked: SettingsData.spotlightCloseNiriOverview
-                    onToggled: checked => SettingsData.set("spotlightCloseNiriOverview", checked)
-                }
-
                 SettingsToggleRow {
                     settingKey: "niriOverviewOverlayEnabled"
                     tags: ["launcher", "niri", "overview", "overlay", "enable"]

quickshell/Modules/WorkspaceOverlays/NiriOverviewOverlay.qml

@@ -115,7 +115,7 @@ Scope {
                             niriOverviewScope.hideSpotlight();
                             return;
                         }
-                        NiriService.toggleOverview();
+                        NiriService.closeOverview();
                     }
                 }
 
@@ -200,7 +200,7 @@ Scope {
                         if (overlayWindow.shouldShowSpotlight || niriOverviewScope.isClosing)
                             return;
                         if ([Qt.Key_Escape, Qt.Key_Return].includes(event.key)) {
-                            NiriService.toggleOverview();
+                            NiriService.closeOverview();
                             event.accepted = true;
                             return;
                         }