aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAqa-Ib <[email protected]>2024-10-16 21:13:35 +0000
committerGitHub <[email protected]>2024-10-16 22:13:35 +0100
commit86e9f69a69990feb880dadd0c2b8c067b2a96fa9 (patch)
treea1396d345c732a75a0a84e25c3d838295bc6b5fa
parent781828a56e495439bfe9c0a701cb29f5e4e2df24 (diff)
downloadHyprland-86e9f69a69990feb880dadd0c2b8c067b2a96fa9.tar.gz
Hyprland-86e9f69a69990feb880dadd0c2b8c067b2a96fa9.zip
layout: move applyGroupRules() to onWindowCreated() (#8139)
-rw-r--r--src/layout/DwindleLayout.cpp4
-rw-r--r--src/layout/IHyprLayout.cpp7
-rw-r--r--src/layout/MasterLayout.cpp2
-rw-r--r--src/render/decorations/CHyprGroupBarDecoration.cpp1
4 files changed, 4 insertions, 10 deletions
diff --git a/src/layout/DwindleLayout.cpp b/src/layout/DwindleLayout.cpp
index 76b26af1..8a7426eb 100644
--- a/src/layout/DwindleLayout.cpp
+++ b/src/layout/DwindleLayout.cpp
@@ -308,8 +308,6 @@ void CHyprDwindleLayout::onWindowCreatedTiling(PHLWINDOW pWindow, eDirection dir
applyNodeDataToWindow(PNODE);
- pWindow->applyGroupRules();
-
return;
}
@@ -450,8 +448,6 @@ void CHyprDwindleLayout::onWindowCreatedTiling(PHLWINDOW pWindow, eDirection dir
NEWPARENT->recalcSizePosRecursive(false, horizontalOverride, verticalOverride);
recalculateMonitor(pWindow->m_iMonitorID);
-
- pWindow->applyGroupRules();
}
void CHyprDwindleLayout::onWindowRemovedTiling(PHLWINDOW pWindow) {
diff --git a/src/layout/IHyprLayout.cpp b/src/layout/IHyprLayout.cpp
index 892ed12c..b8d92636 100644
--- a/src/layout/IHyprLayout.cpp
+++ b/src/layout/IHyprLayout.cpp
@@ -20,6 +20,9 @@ void IHyprLayout::onWindowCreated(PHLWINDOW pWindow, eDirection direction) {
pWindow->m_vPseudoSize = pWindow->m_vLastFloatingSize;
+ if (!g_pXWaylandManager->shouldBeFloated(pWindow)) // do not apply group rules to child windows
+ pWindow->applyGroupRules();
+
bool autoGrouped = IHyprLayout::onWindowCreatedAutoGroup(pWindow);
if (autoGrouped)
return;
@@ -82,8 +85,6 @@ void IHyprLayout::onWindowRemovedFloating(PHLWINDOW pWindow) {
}
void IHyprLayout::onWindowCreatedFloating(PHLWINDOW pWindow) {
- if (!g_pXWaylandManager->shouldBeFloated(pWindow)) // do not apply group rules to child windows
- pWindow->applyGroupRules();
CBox desiredGeometry = {0};
g_pXWaylandManager->getGeometryForWindow(pWindow, &desiredGeometry);
@@ -194,6 +195,7 @@ bool IHyprLayout::onWindowCreatedAutoGroup(PHLWINDOW pWindow) {
if (*PAUTOGROUP // check if auto_group is enabled.
&& OPENINGON->m_sGroupData.pNextWindow.lock() // check if OPENINGON is a group.
+ && OPENINGON != pWindow // prevent freeze when the "group set" window rule makes the new window to be already 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).
@@ -204,7 +206,6 @@ bool IHyprLayout::onWindowCreatedAutoGroup(PHLWINDOW pWindow) {
(*USECURRPOS ? OPENINGON : OPENINGON->getGroupTail())->insertWindowToGroup(pWindow);
OPENINGON->setGroupCurrent(pWindow);
- pWindow->applyGroupRules();
pWindow->updateWindowDecos();
recalculateWindow(pWindow);
diff --git a/src/layout/MasterLayout.cpp b/src/layout/MasterLayout.cpp
index 8fde960d..f983770b 100644
--- a/src/layout/MasterLayout.cpp
+++ b/src/layout/MasterLayout.cpp
@@ -116,8 +116,6 @@ void CHyprMasterLayout::onWindowCreatedTiling(PHLWINDOW pWindow, eDirection dire
return;
}
- pWindow->applyGroupRules();
-
static auto PDROPATCURSOR = CConfigValue<Hyprlang::INT>("master:drop_at_cursor");
eOrientation orientation = getDynamicOrientation(pWindow->m_pWorkspace);
const auto NODEIT = std::find(m_lMasterNodesData.begin(), m_lMasterNodesData.end(), *PNODE);
diff --git a/src/render/decorations/CHyprGroupBarDecoration.cpp b/src/render/decorations/CHyprGroupBarDecoration.cpp
index eca3f2cb..74a1e2e9 100644
--- a/src/render/decorations/CHyprGroupBarDecoration.cpp
+++ b/src/render/decorations/CHyprGroupBarDecoration.cpp
@@ -466,7 +466,6 @@ bool CHyprGroupBarDecoration::onEndWindowDragOnDeco(const Vector2D& pos, PHLWIND
std::swap(pDraggedHead->m_sGroupData.head, pWindowInsertEnd->m_sGroupData.head);
m_pWindow->setGroupCurrent(pDraggedWindow);
- pDraggedWindow->applyGroupRules();
pDraggedWindow->updateWindowDecos();
g_pLayoutManager->getCurrentLayout()->recalculateWindow(pDraggedWindow);