From fd651dc9439ef18e08fd03cb6ff746100a32ffe3 Mon Sep 17 00:00:00 2001
From: bbedward <bbedward@gmail.com>
Date: Tue, 28 Apr 2026 13:19:07 -0400
Subject: [PATCH] niri overlay: fix state binding fixes #2301

---
 .../WorkspaceOverlays/NiriOverviewOverlay.qml | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/quickshell/Modules/WorkspaceOverlays/NiriOverviewOverlay.qml b/quickshell/Modules/WorkspaceOverlays/NiriOverviewOverlay.qml
index a6dd72f0..8699b489 100644
--- a/quickshell/Modules/WorkspaceOverlays/NiriOverviewOverlay.qml
+++ b/quickshell/Modules/WorkspaceOverlays/NiriOverviewOverlay.qml
@@ -68,6 +68,20 @@ Scope {
             hideSpotlight();
     }
 
+    onIsClosingChanged: {
+        if (!isClosing) {
+            closeTimer.stop();
+            return;
+        }
+        closeTimer.restart();
+    }
+
+    Timer {
+        id: closeTimer
+        interval: Theme.expressiveDurations.fast
+        onTriggered: niriOverviewScope.resetState()
+    }
+
     Loader {
         id: niriOverlayLoader
         active: overlayActive || isClosing
@@ -128,7 +142,7 @@ Scope {
                 WindowBlur {
                     targetWindow: overlayWindow
                     readonly property real s: Math.min(1, spotlightContainer.scale)
-                    readonly property bool active: spotlightContainer.visible && spotlightContainer.opacity > 0
+                    readonly property bool active: overlayWindow.shouldShowSpotlight && spotlightContainer.opacity > 0
                     blurX: spotlightContainer.x + spotlightContainer.width * (1 - s) * 0.5
                     blurY: spotlightContainer.y + spotlightContainer.height * (1 - s) * 0.5
                     blurWidth: active ? spotlightContainer.width * s : 0
@@ -256,16 +270,10 @@ Scope {
                     layer.textureSize: layer.enabled ? Qt.size(Math.round(width * overlayWindow.dpr), Math.round(height * overlayWindow.dpr)) : Qt.size(0, 0)
 
                     Behavior on scale {
-                        id: scaleAnimation
                         NumberAnimation {
                             duration: Theme.expressiveDurations.fast
                             easing.type: Easing.BezierSpline
                             easing.bezierCurve: spotlightContainer.visible ? Theme.expressiveCurves.expressiveFastSpatial : Theme.expressiveCurves.standardAccel
-                            onRunningChanged: {
-                                if (running || !spotlightContainer.animatingOut)
-                                    return;
-                                niriOverviewScope.resetState();
-                            }
                         }
                     }