diff options
| author | Aqa-Ib <victorcana@gmx.com> | 2024-10-22 23:51:25 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-23 00:51:25 +0100 |
| commit | 2b6ff6837e81a3b459f2f3cc366830c420a7a62e (patch) | |
| tree | ccb75f5411c186a01b67848b0bed7cb9e4a018ba /src/layout/IHyprLayout.cpp | |
| parent | 29997ef4ba8ef0a80390e80199998d1390177454 (diff) | |
groups: add group_on_movetoworkspace (#8159)
Diffstat (limited to 'src/layout/IHyprLayout.cpp')
| -rw-r--r-- | src/layout/IHyprLayout.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/layout/IHyprLayout.cpp b/src/layout/IHyprLayout.cpp index 95919c65..655f2341 100644 --- a/src/layout/IHyprLayout.cpp +++ b/src/layout/IHyprLayout.cpp @@ -194,8 +194,9 @@ bool IHyprLayout::onWindowCreatedAutoGroup(PHLWINDOW pWindow) { denied = true; if (*PAUTOGROUP // check if auto_group is enabled. - && OPENINGON->m_sGroupData.pNextWindow.lock() // check if OPENINGON is a group. + && OPENINGON // this shouldn't be 0, but honestly, better safe than sorry. && OPENINGON != pWindow // prevent freeze when the "group set" window rule makes the new window to be already a group. + && OPENINGON->m_sGroupData.pNextWindow.lock() // check if OPENINGON is a group. && pWindow->canBeGroupedInto(OPENINGON) // check if the new window can be grouped into OPENINGON. && !g_pXWaylandManager->shouldBeFloated(pWindow) // don't group child windows. Fix for floated groups. Tiled groups don't need this because we check if !denied. && !denied) { // don't group a new floated window into a tiled group (for convenience). @@ -352,7 +353,7 @@ void IHyprLayout::onEndDragWindow() { DRAGGINGWINDOW->m_bDraggingTiled = false; } - if (DRAGGINGWINDOW->m_sGroupData.pNextWindow.lock()) { + if (DRAGGINGWINDOW->m_sGroupData.pNextWindow) { std::vector<PHLWINDOW> members; PHLWINDOW curr = DRAGGINGWINDOW->getGroupHead(); do { |