diff options
| author | vaxerski <43317083+vaxerski@users.noreply.github.com> | 2022-05-18 13:10:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-18 13:10:22 +0200 |
| commit | 6c437763f65489b7c720c56d2f2f69781a39e497 (patch) | |
| tree | 81d0fd4a54d5891558b62969ba3b41853dd761ff /src/layout/DwindleLayout.cpp | |
| parent | c2922b6b0941fc5fd4e82877df179e14cc2d3f93 (diff) | |
| parent | ba573a529afdbf368aa632cf70b41c9a0595578b (diff) | |
Merge branch 'main' into scaling
Diffstat (limited to 'src/layout/DwindleLayout.cpp')
| -rw-r--r-- | src/layout/DwindleLayout.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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); |