summaryrefslogtreecommitdiff
path: root/src/layout
diff options
context:
space:
mode:
authorvaxerski <43317083+vaxerski@users.noreply.github.com>2023-05-24 19:23:07 +0200
committervaxerski <43317083+vaxerski@users.noreply.github.com>2023-05-24 19:23:10 +0200
commita4c120d6081ee35b7997afdec451480048242d06 (patch)
tree5f7927eb005721b209753632c873bbfc95a035f1 /src/layout
parent53285a75ad4fbc68269a71ed24a41fe60164b047 (diff)
layouts: ignore direction forces on non-map
Diffstat (limited to 'src/layout')
-rw-r--r--src/layout/DwindleLayout.cpp2
-rw-r--r--src/layout/MasterLayout.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/layout/DwindleLayout.cpp b/src/layout/DwindleLayout.cpp
index 523283ec..f433c573 100644
--- a/src/layout/DwindleLayout.cpp
+++ b/src/layout/DwindleLayout.cpp
@@ -371,7 +371,7 @@ void CHyprDwindleLayout::onWindowCreatedTiling(CWindow* pWindow) {
if (*PERMANENTDIRECTIONOVERRIDE == 0)
overrideDirection = OneTimeFocus::NOFOCUS;
- } else if (*PFORCESPLIT == 0) {
+ } else if (*PFORCESPLIT == 0 || !pWindow->m_bFirstMap) {
if ((SIDEBYSIDE &&
VECINRECT(MOUSECOORDS, NEWPARENT->position.x, NEWPARENT->position.y / *PWIDTHMULTIPLIER, NEWPARENT->position.x + NEWPARENT->size.x / 2.f,
NEWPARENT->position.y + NEWPARENT->size.y)) ||
diff --git a/src/layout/MasterLayout.cpp b/src/layout/MasterLayout.cpp
index 66fb6eb0..fcd8c900 100644
--- a/src/layout/MasterLayout.cpp
+++ b/src/layout/MasterLayout.cpp
@@ -101,7 +101,7 @@ void CHyprMasterLayout::onWindowCreatedTiling(CWindow* pWindow) {
return;
}
- if (*PNEWISMASTER || WINDOWSONWORKSPACE == 1) {
+ if (*PNEWISMASTER || WINDOWSONWORKSPACE == 1 || (!pWindow->m_bFirstMap && OPENINGON->isMaster)) {
for (auto& nd : m_lMasterNodesData) {
if (nd.isMaster && nd.workspaceID == PNODE->workspaceID) {
nd.isMaster = false;