summaryrefslogtreecommitdiff
path: root/src/layout
diff options
context:
space:
mode:
Diffstat (limited to 'src/layout')
-rw-r--r--src/layout/DwindleLayout.cpp21
-rw-r--r--src/layout/IHyprLayout.cpp69
-rw-r--r--src/layout/IHyprLayout.hpp1
-rw-r--r--src/layout/MasterLayout.cpp20
4 files changed, 58 insertions, 53 deletions
diff --git a/src/layout/DwindleLayout.cpp b/src/layout/DwindleLayout.cpp
index ed47fa44..04cbf21d 100644
--- a/src/layout/DwindleLayout.cpp
+++ b/src/layout/DwindleLayout.cpp
@@ -340,26 +340,7 @@ void CHyprDwindleLayout::onWindowCreatedTiling(PHLWINDOW pWindow, eDirection dir
return;
}
- // if it's a group, add the window
- if (OPENINGON->pWindow->m_sGroupData.pNextWindow.lock() // target is group
- && pWindow->canBeGroupedInto(OPENINGON->pWindow.lock()) && !m_vOverrideFocalPoint) { // we are not moving window
- m_lDwindleNodesData.remove(*PNODE);
-
- static auto USECURRPOS = CConfigValue<Hyprlang::INT>("group:insert_after_current");
- (*USECURRPOS ? OPENINGON->pWindow.lock() : OPENINGON->pWindow->getGroupTail())->insertWindowToGroup(pWindow);
-
- OPENINGON->pWindow->setGroupCurrent(pWindow);
- pWindow->applyGroupRules();
- pWindow->updateWindowDecos();
- recalculateWindow(pWindow);
-
- if (!pWindow->getDecorationByType(DECORATION_GROUPBAR))
- pWindow->addWindowDeco(std::make_unique<CHyprGroupBarDecoration>(pWindow));
-
- return;
- }
-
- // If it's not, get the node under our cursor
+ // get the node under our cursor
m_lDwindleNodesData.push_back(SDwindleNodeData());
const auto NEWPARENT = &m_lDwindleNodesData.back();
diff --git a/src/layout/IHyprLayout.cpp b/src/layout/IHyprLayout.cpp
index c5a5373c..0fb78d02 100644
--- a/src/layout/IHyprLayout.cpp
+++ b/src/layout/IHyprLayout.cpp
@@ -9,23 +9,25 @@
#include "../xwayland/XSurface.hpp"
void IHyprLayout::onWindowCreated(PHLWINDOW pWindow, eDirection direction) {
- if (pWindow->m_bIsFloating) {
- onWindowCreatedFloating(pWindow);
- } else {
- CBox desiredGeometry = {};
- g_pXWaylandManager->getGeometryForWindow(pWindow, &desiredGeometry);
+ CBox desiredGeometry = {};
+ g_pXWaylandManager->getGeometryForWindow(pWindow, &desiredGeometry);
- if (desiredGeometry.width <= 5 || desiredGeometry.height <= 5) {
- const auto PMONITOR = g_pCompositor->getMonitorFromID(pWindow->m_iMonitorID);
- pWindow->m_vLastFloatingSize = PMONITOR->vecSize / 2.f;
- } else {
- pWindow->m_vLastFloatingSize = Vector2D(desiredGeometry.width, desiredGeometry.height);
- }
+ if (desiredGeometry.width <= 5 || desiredGeometry.height <= 5) {
+ const auto PMONITOR = g_pCompositor->getMonitorFromID(pWindow->m_iMonitorID);
+ pWindow->m_vLastFloatingSize = PMONITOR->vecSize / 2.f;
+ } else
+ pWindow->m_vLastFloatingSize = Vector2D(desiredGeometry.width, desiredGeometry.height);
+
+ pWindow->m_vPseudoSize = pWindow->m_vLastFloatingSize;
- pWindow->m_vPseudoSize = pWindow->m_vLastFloatingSize;
+ bool autoGrouped = IHyprLayout::onWindowCreatedAutoGroup(pWindow);
+ if (autoGrouped)
+ return;
+ if (pWindow->m_bIsFloating)
+ onWindowCreatedFloating(pWindow);
+ else
onWindowCreatedTiling(pWindow, direction);
- }
}
void IHyprLayout::onWindowRemoved(PHLWINDOW pWindow) {
@@ -178,6 +180,47 @@ void IHyprLayout::onWindowCreatedFloating(PHLWINDOW pWindow) {
}
}
+bool IHyprLayout::onWindowCreatedAutoGroup(PHLWINDOW pWindow) {
+ static auto AUTOGROUP = CConfigValue<Hyprlang::INT>("group:auto_group");
+ if ((*AUTOGROUP || g_pInputManager->m_bWasDraggingWindow) // check if auto_group is enabled, or, if the user is manually dragging the window into the group.
+ && g_pCompositor->m_pLastWindow.lock() // check if a focused window exists.
+ && g_pCompositor->m_pLastWindow != pWindow // fixes a freeze when activating togglefloat to transform a floating group into a tiled group.
+ && g_pCompositor->m_pLastWindow->m_pWorkspace ==
+ pWindow
+ ->m_pWorkspace // fix for multimonitor: when there is a focused group in monitor 1 and monitor 2 is empty, this enables adding the first window of monitor 2 when using the mouse to focus it.
+ && g_pCompositor->m_pLastWindow->m_sGroupData.pNextWindow.lock() // check if the focused window is a group
+ && pWindow->canBeGroupedInto(g_pCompositor->m_pLastWindow.lock()) // check if the new window can be grouped into the focused group
+ && !g_pXWaylandManager->shouldBeFloated(pWindow)) { // don't group XWayland windows that should be floated.
+
+ switch (pWindow->m_bIsFloating) {
+ case false:
+ if (g_pCompositor->m_pLastWindow->m_bIsFloating)
+ pWindow->m_bIsFloating = true;
+ break;
+
+ case true:
+ if (!g_pCompositor->m_pLastWindow->m_bIsFloating)
+ pWindow->m_bIsFloating = false;
+ break;
+ }
+
+ static auto USECURRPOS = CConfigValue<Hyprlang::INT>("group:insert_after_current");
+ (*USECURRPOS ? g_pCompositor->m_pLastWindow : g_pCompositor->m_pLastWindow->getGroupTail())->insertWindowToGroup(pWindow);
+
+ g_pCompositor->m_pLastWindow->setGroupCurrent(pWindow);
+ pWindow->applyGroupRules();
+ pWindow->updateWindowDecos();
+ recalculateWindow(pWindow);
+
+ if (!pWindow->getDecorationByType(DECORATION_GROUPBAR))
+ pWindow->addWindowDeco(std::make_unique<CHyprGroupBarDecoration>(pWindow));
+
+ return true;
+ }
+
+ return false;
+}
+
void IHyprLayout::onBeginDragWindow() {
const auto DRAGGINGWINDOW = g_pInputManager->currentlyDraggedWindow.lock();
diff --git a/src/layout/IHyprLayout.hpp b/src/layout/IHyprLayout.hpp
index 7e0d5704..f9e2de0d 100644
--- a/src/layout/IHyprLayout.hpp
+++ b/src/layout/IHyprLayout.hpp
@@ -47,6 +47,7 @@ class IHyprLayout {
virtual void onWindowCreated(PHLWINDOW, eDirection direction = DIRECTION_DEFAULT);
virtual void onWindowCreatedTiling(PHLWINDOW, eDirection direction = DIRECTION_DEFAULT) = 0;
virtual void onWindowCreatedFloating(PHLWINDOW);
+ virtual bool onWindowCreatedAutoGroup(PHLWINDOW);
/*
Return tiled status
diff --git a/src/layout/MasterLayout.cpp b/src/layout/MasterLayout.cpp
index 8fa324b0..04a6ea29 100644
--- a/src/layout/MasterLayout.cpp
+++ b/src/layout/MasterLayout.cpp
@@ -116,26 +116,6 @@ void CHyprMasterLayout::onWindowCreatedTiling(PHLWINDOW pWindow, eDirection dire
return;
}
- // if it's a group, add the window
- if (OPENINGON && OPENINGON != PNODE && OPENINGON->pWindow->m_sGroupData.pNextWindow.lock() // target is group
- && pWindow->canBeGroupedInto(OPENINGON->pWindow.lock())) {
-
- m_lMasterNodesData.remove(*PNODE);
-
- static auto USECURRPOS = CConfigValue<Hyprlang::INT>("group:insert_after_current");
- (*USECURRPOS ? OPENINGON->pWindow.lock() : OPENINGON->pWindow->getGroupTail())->insertWindowToGroup(pWindow);
-
- OPENINGON->pWindow->setGroupCurrent(pWindow);
- pWindow->applyGroupRules();
- pWindow->updateWindowDecos();
- recalculateWindow(pWindow);
-
- if (!pWindow->getDecorationByType(DECORATION_GROUPBAR))
- pWindow->addWindowDeco(std::make_unique<CHyprGroupBarDecoration>(pWindow));
-
- return;
- }
-
pWindow->applyGroupRules();
static auto PDROPATCURSOR = CConfigValue<Hyprlang::INT>("master:drop_at_cursor");
generated by cgit v1.2.3 (git 2.25.1) at 2026-11-03 17:15:36 +0000