From e90c1f7022ffd82e463c48260a97850c834f347d Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Mon, 16 May 2022 17:27:55 +0200
Subject: [PATCH] added dwindle:preserve_split

---
 src/config/ConfigManager.cpp |  1 +
 src/layout/DwindleLayout.cpp | 33 +++++++++++++++++++++++++++++----
 src/layout/DwindleLayout.hpp |  2 ++
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp
index 631264e05..92e7f0cf1 100644
--- a/src/config/ConfigManager.cpp
+++ b/src/config/ConfigManager.cpp
@@ -47,6 +47,7 @@ void CConfigManager::setDefaultVars() {
     configValues["dwindle:col.group_border"].intValue = 0x66777700;
     configValues["dwindle:col.group_border_active"].intValue = 0x66ffff00;
     configValues["dwindle:force_split"].intValue = 0;
+    configValues["dwindle:preserve_split"].intValue = 0;
 
     configValues["animations:enabled"].intValue = 1;
     configValues["animations:speed"].floatValue = 7.f;
diff --git a/src/layout/DwindleLayout.cpp b/src/layout/DwindleLayout.cpp
index 620143f63..c7e3aa127 100644
--- a/src/layout/DwindleLayout.cpp
+++ b/src/layout/DwindleLayout.cpp
@@ -23,7 +23,12 @@ void SDwindleNodeData::recalcSizePosRecursive() {
 
         const auto REVERSESPLITRATIO = 2.f - splitRatio;
 
-        if (size.x > size.y) {
+        if (g_pConfigManager->getInt("dwindle:preserve_split") == 0)
+            splitTop = size.y > size.x;
+
+        const auto SPLITSIDE = !splitTop;
+
+        if (SPLITSIDE) {
             // split sidey
             children[0]->position = position;
             children[0]->size = Vector2D(size.x / 2.f * splitRatio, size.y);
@@ -213,6 +218,7 @@ void CHyprDwindleLayout::onWindowCreated(CWindow* pWindow) {
 
     // if cursor over first child, make it first, etc
     const auto SIDEBYSIDE = NEWPARENT->size.x / NEWPARENT->size.y > 1.f;
+    NEWPARENT->splitTop = !SIDEBYSIDE;
     const auto MOUSECOORDS = g_pInputManager->getMouseCoordsInternal();
 
     const auto FORCESPLIT = g_pConfigManager->getInt("dwindle:force_split");
@@ -485,10 +491,10 @@ void CHyprDwindleLayout::onMouseMove(const Vector2D& mousePos) {
             if (!PPARENT)
                 return; // the only window on a workspace, ignore
 
-            const bool PARENTSIDEBYSIDE = PPARENT->size.x / PPARENT->size.y > 1.f;
+            const bool PARENTSIDEBYSIDE = !PPARENT->splitTop;
 
             // Get the parent's parent
-            const auto PPARENT2 = PPARENT->pParent;
+            auto PPARENT2 = PPARENT->pParent;
 
             // No parent means we have only 2 windows, and thus one axis of freedom
             if (!PPARENT2) {
@@ -505,7 +511,26 @@ void CHyprDwindleLayout::onMouseMove(const Vector2D& mousePos) {
                 return;
             }
 
-            // If there is a parent 2, we have 2 axes of freedom
+            // Get first parent with other split
+            while(PPARENT2 && PPARENT2->splitTop == !PARENTSIDEBYSIDE)
+                PPARENT2 = PPARENT2->pParent;
+
+            // no parent, one axis of freedom
+            if (!PPARENT2) {
+                if (PARENTSIDEBYSIDE) {
+                    allowedMovement.x *= 2.f / PPARENT->size.x;
+                    PPARENT->splitRatio = std::clamp(PPARENT->splitRatio + allowedMovement.x, (double)0.1f, (double)1.9f);
+                    PPARENT->recalcSizePosRecursive();
+                } else {
+                    allowedMovement.y *= 2.f / PPARENT->size.y;
+                    PPARENT->splitRatio = std::clamp(PPARENT->splitRatio + allowedMovement.y, (double)0.1f, (double)1.9f);
+                    PPARENT->recalcSizePosRecursive();
+                }
+
+                return;
+            }
+
+            // 2 axes of freedom
             const auto SIDECONTAINER = PARENTSIDEBYSIDE ? PPARENT : PPARENT2;
             const auto TOPCONTAINER = PARENTSIDEBYSIDE ? PPARENT2 : PPARENT;
 
diff --git a/src/layout/DwindleLayout.hpp b/src/layout/DwindleLayout.hpp
index 7eeb57932..c1fd7a7b4 100644
--- a/src/layout/DwindleLayout.hpp
+++ b/src/layout/DwindleLayout.hpp
@@ -14,6 +14,8 @@ struct SDwindleNodeData {
 
     std::array<SDwindleNodeData*, 2> children = { nullptr, nullptr };
 
+    bool            splitTop = false; // for preserve_split
+
     bool            isGroup = false;
     int             groupMemberActive = 0;
     std::deque<SDwindleNodeData*> groupMembers;