From c2b5dd1be6e108614c8a30aec817925540815a87 Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Fri, 14 Apr 2023 16:22:55 +0100
Subject: [PATCH] keybinds: only warp on different monitor ws

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

diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp
index df48fefe..fb902e74 100644
--- a/src/managers/KeybindManager.cpp
+++ b/src/managers/KeybindManager.cpp
@@ -784,6 +784,7 @@ void CKeybindManager::changeworkspace(std::string args) {
             PMONITORWORKSPACEOWNER->changeWorkspace(pWorkspaceToChangeTo);
 
             if (PMONITOR != PMONITORWORKSPACEOWNER) {
+                g_pCompositor->warpCursorTo(PMONITORWORKSPACEOWNER->vecPosition + PMONITORWORKSPACEOWNER->vecSize / 2.f);
                 g_pCompositor->setActiveMonitor(PMONITORWORKSPACEOWNER);
                 if (const auto PLASTWINDOW = pWorkspaceToChangeTo->getLastFocusedWindow(); PLASTWINDOW)
                     g_pCompositor->focusWindow(PLASTWINDOW);
@@ -815,9 +816,10 @@ void CKeybindManager::changeworkspace(std::string args) {
     g_pCompositor->setActiveMonitor(PMONITORWORKSPACEOWNER);
 
     PMONITORWORKSPACEOWNER->changeWorkspace(pWorkspaceToChangeTo);
-    g_pCompositor->warpCursorTo(PMONITORWORKSPACEOWNER->vecPosition + PMONITORWORKSPACEOWNER->vecSize / 2.f);
 
     if (PMONITOR != PMONITORWORKSPACEOWNER) {
+        g_pCompositor->warpCursorTo(PMONITORWORKSPACEOWNER->vecPosition + PMONITORWORKSPACEOWNER->vecSize / 2.f);
+
         if (const auto PLASTWINDOW = pWorkspaceToChangeTo->getLastFocusedWindow(); PLASTWINDOW)
             g_pCompositor->focusWindow(PLASTWINDOW);
         else