From 51172129d7e5513e9ac268fe8f8a7659970998ac Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Thu, 28 Apr 2022 17:55:25 +0200
Subject: deactivate exclusive

---
 src/managers/InputManager.cpp   | 2 +-
 src/managers/KeybindManager.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/managers')

diff --git a/src/managers/InputManager.cpp b/src/managers/InputManager.cpp
index eacf7e40..2853924d 100644
--- a/src/managers/InputManager.cpp
+++ b/src/managers/InputManager.cpp
@@ -43,7 +43,7 @@ void CInputManager::mouseMoveUnified(uint32_t time, bool refocus) {
         wlr_ext_workspace_group_handle_v1_output_enter(PMONITOR->pWLRWorkspaceGroupHandle, PMONITOR->output);
 
         // set active workspace and deactivate all other in wlr
-        g_pCompositor->deactivateAllWLRWorkspaces();
+        g_pCompositor->deactivateAllWLRWorkspaces(g_pCompositor->getWorkspaceByID(PMONITOR->activeWorkspace)->m_pWlrHandle);
         wlr_ext_workspace_handle_v1_set_active(g_pCompositor->getWorkspaceByID(PMONITOR->activeWorkspace)->m_pWlrHandle, true);
     }
 
diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp
index 8a503005..7e7b4079 100644
--- a/src/managers/KeybindManager.cpp
+++ b/src/managers/KeybindManager.cpp
@@ -214,7 +214,7 @@ void CKeybindManager::changeworkspace(std::string args) {
         g_pCompositor->focusWindow(g_pCompositor->getFirstWindowOnWorkspace(workspaceToChangeTo));
 
         // set active and deactivate all other in wlr
-        g_pCompositor->deactivateAllWLRWorkspaces();
+        g_pCompositor->deactivateAllWLRWorkspaces(g_pCompositor->getWorkspaceByID(workspaceToChangeTo)->m_pWlrHandle);
         wlr_ext_workspace_handle_v1_set_active(g_pCompositor->getWorkspaceByID(workspaceToChangeTo)->m_pWlrHandle, true);
 
         Debug::log(LOG, "Changed to workspace %i", workspaceToChangeTo);
@@ -247,7 +247,7 @@ void CKeybindManager::changeworkspace(std::string args) {
     g_pCompositor->fixXWaylandWindowsOnWorkspace(OLDWORKSPACE);
 
     // set active and deactivate all other
-    g_pCompositor->deactivateAllWLRWorkspaces();
+    g_pCompositor->deactivateAllWLRWorkspaces(PWORKSPACE->m_pWlrHandle);
     wlr_ext_workspace_handle_v1_set_active(PWORKSPACE->m_pWlrHandle, true);
 
     // mark the monitor dirty
-- 
cgit v1.2.3