From f70d0ec5aa7ad7fdfd8229204c3a0cbfe04f13e7 Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Wed, 18 May 2022 12:18:58 +0200
Subject: Added movetoworkspacesilent

---
 src/layout/DwindleLayout.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/layout/DwindleLayout.cpp')

diff --git a/src/layout/DwindleLayout.cpp b/src/layout/DwindleLayout.cpp
index d224e775..5c133336 100644
--- a/src/layout/DwindleLayout.cpp
+++ b/src/layout/DwindleLayout.cpp
@@ -176,7 +176,7 @@ void CHyprDwindleLayout::onWindowCreated(CWindow* pWindow) {
     const auto PMONITOR = g_pCompositor->getMonitorFromID(pWindow->m_iMonitorID);
 
     // Populate the node with our window's data
-    PNODE->workspaceID = PMONITOR->activeWorkspace;
+    PNODE->workspaceID = pWindow->m_iWorkspaceID;
     PNODE->pWindow = pWindow;
     PNODE->isNode = false;
     PNODE->layout = this;
@@ -184,7 +184,7 @@ void CHyprDwindleLayout::onWindowCreated(CWindow* pWindow) {
     SDwindleNodeData* OPENINGON;
     const auto MONFROMCURSOR = g_pCompositor->getMonitorFromCursor();
 
-    if (PMONITOR->ID == MONFROMCURSOR->ID)
+    if (PMONITOR->ID == MONFROMCURSOR->ID && PNODE->workspaceID == PMONITOR->activeWorkspace)
         OPENINGON = getNodeFromWindow(g_pCompositor->vectorToWindowTiled(g_pInputManager->getMouseCoordsInternal()));
     else
         OPENINGON = getFirstNodeOnWorkspace(PMONITOR->activeWorkspace);
-- 
cgit v1.2.3