From 9f3a64481ecb277de6775efbb0f3d8d7648a610c Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Mon, 4 Sep 2023 15:34:07 +0200
Subject: dwindle: add proper movement for window move binds

ditches the "movewindow = swapwindow" mechanism. Fixes #2804
---
 src/managers/KeybindManager.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp
index b550fb6e..0fb9d838 100644
--- a/src/managers/KeybindManager.cpp
+++ b/src/managers/KeybindManager.cpp
@@ -1160,9 +1160,9 @@ void CKeybindManager::moveActiveTo(std::string args) {
 
     // If the window to change to is on the same workspace, switch them
     const auto PWINDOWTOCHANGETO = g_pCompositor->getWindowInDirection(PLASTWINDOW, arg);
-    if (PWINDOWTOCHANGETO && PWINDOWTOCHANGETO->m_iWorkspaceID == PLASTWINDOW->m_iWorkspaceID) {
-        g_pLayoutManager->getCurrentLayout()->switchWindows(PLASTWINDOW, PWINDOWTOCHANGETO);
-        g_pCompositor->warpCursorTo(PWINDOWTOCHANGETO->m_vRealPosition.vec() + PWINDOWTOCHANGETO->m_vRealSize.vec() / 2.0);
+    if (PWINDOWTOCHANGETO) {
+        g_pLayoutManager->getCurrentLayout()->moveWindowTo(PLASTWINDOW, args);
+        g_pCompositor->warpCursorTo(PLASTWINDOW->m_vRealPosition.goalv() + PLASTWINDOW->m_vRealSize.goalv() / 2.0);
         return;
     }
 
-- 
cgit v1.2.3