From 3bfaeacf7da1771243771139178e22d9893e7232 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <RyanDwyer@users.noreply.github.com>
Date: Sun, 26 Feb 2023 23:44:11 +1000
Subject: [PATCH] movefocus: Set new workspace as active when focusing new
 monitor (#1640)

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

diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp
index 81276eef7..63cabd07b 100644
--- a/src/managers/KeybindManager.cpp
+++ b/src/managers/KeybindManager.cpp
@@ -1132,8 +1132,12 @@ void CKeybindManager::moveFocusTo(std::string args) {
             if (PLASTWINDOW->m_iMonitorID != PWINDOWTOCHANGETO->m_iMonitorID) {
                 // event
                 const auto PNEWMON = g_pCompositor->getMonitorFromID(PWINDOWTOCHANGETO->m_iMonitorID);
+                const auto PNEWWORKSPACE = g_pCompositor->getWorkspaceByID(PWINDOWTOCHANGETO->m_iWorkspaceID);
 
                 g_pCompositor->setActiveMonitor(PNEWMON);
+
+                g_pCompositor->deactivateAllWLRWorkspaces(PNEWWORKSPACE->m_pWlrHandle);
+                PNEWWORKSPACE->setActive(true);
             }
         }
     };