From 3dda0a55c5552925affe4b553ab832b9226f74b6 Mon Sep 17 00:00:00 2001
From: Vaxry <vaxry@vaxry.net>
Date: Thu, 4 Apr 2024 01:31:10 +0100
Subject: [PATCH] expo: close on detected workspace change

ref #112
---
 hyprexpo/overview.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/hyprexpo/overview.cpp b/hyprexpo/overview.cpp
index ef557e3..18ae932 100644
--- a/hyprexpo/overview.cpp
+++ b/hyprexpo/overview.cpp
@@ -209,6 +209,11 @@ COverview::COverview(PHLWORKSPACE startedOn_, bool swipe_) : startedOn(startedOn
 }
 
 void COverview::redrawID(int id, bool forcelowres) {
+    if (pMonitor->activeWorkspace != startedOn && !closing) {
+        // likely user changed.
+        onWorkspaceChange();
+    }
+
     blockOverviewRendering = true;
 
     g_pHyprRenderer->makeEGLCurrent();
@@ -356,8 +361,11 @@ void COverview::onPreRender() {
 }
 
 void COverview::onWorkspaceChange() {
-    startedOn->startAnim(false, false, true);
-    startedOn = pMonitor->activeWorkspace;
+    if (valid(startedOn))
+        startedOn->startAnim(false, false, true);
+    else
+        startedOn = pMonitor->activeWorkspace;
+
     for (size_t i = 0; i < SIDE_LENGTH * SIDE_LENGTH; ++i) {
         if (images[i].workspaceID != pMonitor->activeWorkspaceID())
             continue;
@@ -365,14 +373,16 @@ void COverview::onWorkspaceChange() {
         openedID = i;
         break;
     }
-    startedOn->startAnim(true, true, true);
+
+    closeOnID = openedID;
+    close();
 }
 
 void COverview::render() {
 
     const auto GAPSIZE = (closing ? (1.0 - size.getPercent()) : size.getPercent()) * GAP_WIDTH;
 
-    if (pMonitor->activeWorkspace != startedOn) {
+    if (pMonitor->activeWorkspace != startedOn && !closing) {
         // likely user changed.
         onWorkspaceChange();
     }