From 0ad33742e14f73bb46acf9bad97fe963d495e025 Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Tue, 24 May 2022 22:21:31 +0200
Subject: fix workspace event and add activewindow and activemon

---
 src/managers/KeybindManager.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/managers/KeybindManager.cpp')

diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp
index d4340545..ed2be2c5 100644
--- a/src/managers/KeybindManager.cpp
+++ b/src/managers/KeybindManager.cpp
@@ -208,6 +208,10 @@ void CKeybindManager::changeworkspace(std::string args) {
 
             // start anim on new workspace
             PWORKSPACETOCHANGETO->startAnim(true, ANIMTOLEFT);
+
+            // Event ONLY if workspace is actually "changed" and we arent just focusing
+            if (!m_bSuppressWorkspaceChangeEvents)
+                g_pEventManager->postEvent(SHyprIPCEvent("workspace", PWORKSPACETOCHANGETO->m_szName));
         }
            
 
@@ -232,10 +236,6 @@ void CKeybindManager::changeworkspace(std::string args) {
         // mark the monitor dirty
         g_pHyprRenderer->damageMonitor(PMONITOR);
 
-        // Event
-        if (!m_bSuppressWorkspaceChangeEvents)
-            g_pEventManager->postEvent(SHyprIPCEvent("workspace", PWORKSPACETOCHANGETO->m_szName));
-
         return;
     }
 
-- 
cgit v1.2.3