summaryrefslogtreecommitdiff
path: root/src/layout/DwindleLayout.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/layout/DwindleLayout.cpp')
-rw-r--r--src/layout/DwindleLayout.cpp159
1 files changed, 109 insertions, 50 deletions
diff --git a/src/layout/DwindleLayout.cpp b/src/layout/DwindleLayout.cpp
index d0d4dd23..bd131b16 100644
--- a/src/layout/DwindleLayout.cpp
+++ b/src/layout/DwindleLayout.cpp
@@ -318,7 +318,7 @@ void CHyprDwindleLayout::onWindowCreatedTiling(CWindow* pWindow) {
// if it's a group, add the window
if (OPENINGON->pWindow->m_sGroupData.pNextWindow && !OPENINGON->pWindow->getGroupHead()->m_sGroupData.locked &&
- !g_pKeybindManager->m_bGroupsLocked) { // target is an unlocked group
+ !g_pKeybindManager->m_bGroupsLocked) { // target is an unlocked group
if (!pWindow->m_sGroupData.pNextWindow) { // source is not a group
m_lDwindleNodesData.remove(*PNODE);
@@ -606,7 +606,8 @@ void CHyprDwindleLayout::resizeActiveWindow(const Vector2D& pixResize, eRectCorn
return;
}
- const auto PANIMATE = &g_pConfigManager->getConfigValuePtr("misc:animate_manual_resizes")->intValue;
+ const auto PANIMATE = &g_pConfigManager->getConfigValuePtr("misc:animate_manual_resizes")->intValue;
+ const auto PSMARTRESIZING = &g_pConfigManager->getConfigValuePtr("dwindle:smart_resizing")->intValue;
// get some data about our window
const auto PMONITOR = g_pCompositor->getMonitorFromID(PWINDOW->m_iMonitorID);
@@ -661,63 +662,121 @@ void CHyprDwindleLayout::resizeActiveWindow(const Vector2D& pixResize, eRectCorn
if (DISPLAYBOTTOM && DISPLAYTOP)
allowedMovement.y = 0;
- // Identify inner and outer nodes for both directions.
+ if (*PSMARTRESIZING == 1) {
+ // Identify inner and outer nodes for both directions
+ SDwindleNodeData* PVOUTER = nullptr;
+ SDwindleNodeData* PVINNER = nullptr;
+ SDwindleNodeData* PHOUTER = nullptr;
+ SDwindleNodeData* PHINNER = nullptr;
+
+ const auto LEFT = corner == CORNER_TOPLEFT || corner == CORNER_BOTTOMLEFT;
+ const auto TOP = corner == CORNER_TOPLEFT || corner == CORNER_TOPRIGHT;
+ const auto RIGHT = corner == CORNER_TOPRIGHT || corner == CORNER_BOTTOMRIGHT;
+ const auto BOTTOM = corner == CORNER_BOTTOMLEFT || corner == CORNER_BOTTOMRIGHT;
+ const auto NONE = corner == CORNER_NONE;
+
+ for (auto PCURRENT = PNODE; PCURRENT && PCURRENT->pParent; PCURRENT = PCURRENT->pParent) {
+ const auto PPARENT = PCURRENT->pParent;
+
+ if (!PVOUTER && PPARENT->splitTop && (NONE || (TOP && PPARENT->children[1] == PCURRENT) || (BOTTOM && PPARENT->children[0] == PCURRENT)))
+ PVOUTER = PCURRENT;
+ else if (!PVOUTER && !PVINNER && PPARENT->splitTop)
+ PVINNER = PCURRENT;
+ else if (!PHOUTER && !PPARENT->splitTop && (NONE || (LEFT && PPARENT->children[1] == PCURRENT) || (RIGHT && PPARENT->children[0] == PCURRENT)))
+ PHOUTER = PCURRENT;
+ else if (!PHOUTER && !PHINNER && !PPARENT->splitTop)
+ PHINNER = PCURRENT;
+
+ if (PVOUTER && PHOUTER)
+ break;
+ }
- SDwindleNodeData* PVOUTER = nullptr;
- SDwindleNodeData* PVINNER = nullptr;
- SDwindleNodeData* PHOUTER = nullptr;
- SDwindleNodeData* PHINNER = nullptr;
+ if (PHOUTER) {
+ PHOUTER->pParent->splitRatio = std::clamp(PHOUTER->pParent->splitRatio + allowedMovement.x * 2.f / PHOUTER->pParent->size.x, 0.1, 1.9);
+
+ if (PHINNER) {
+ const auto ORIGINAL = PHINNER->size.x;
+ PHOUTER->pParent->recalcSizePosRecursive(*PANIMATE == 0);
+ if (PHINNER->pParent->children[0] == PHINNER)
+ PHINNER->pParent->splitRatio = std::clamp((ORIGINAL - allowedMovement.x) / PHINNER->pParent->size.x * 2.f, 0.1, 1.9);
+ else
+ PHINNER->pParent->splitRatio = std::clamp(2 - (ORIGINAL + allowedMovement.x) / PHINNER->pParent->size.x * 2.f, 0.1, 1.9);
+ PHINNER->pParent->recalcSizePosRecursive(*PANIMATE == 0);
+ } else
+ PHOUTER->pParent->recalcSizePosRecursive(*PANIMATE == 0);
+ }
- const auto LEFT = corner == CORNER_TOPLEFT || corner == CORNER_BOTTOMLEFT;
- const auto TOP = corner == CORNER_TOPLEFT || corner == CORNER_TOPRIGHT;
- const auto RIGHT = corner == CORNER_TOPRIGHT || corner == CORNER_BOTTOMRIGHT;
- const auto BOTTOM = corner == CORNER_BOTTOMLEFT || corner == CORNER_BOTTOMRIGHT;
- const auto NONE = corner == CORNER_NONE;
+ if (PVOUTER) {
+ PVOUTER->pParent->splitRatio = std::clamp(PVOUTER->pParent->splitRatio + allowedMovement.y * 2.f / PVOUTER->pParent->size.y, 0.1, 1.9);
+
+ if (PVINNER) {
+ const auto ORIGINAL = PVINNER->size.y;
+ PVOUTER->pParent->recalcSizePosRecursive(*PANIMATE == 0);
+ if (PVINNER->pParent->children[0] == PVINNER)
+ PVINNER->pParent->splitRatio = std::clamp((ORIGINAL - allowedMovement.y) / PVINNER->pParent->size.y * 2.f, 0.1, 1.9);
+ else
+ PVINNER->pParent->splitRatio = std::clamp(2 - (ORIGINAL + allowedMovement.y) / PVINNER->pParent->size.y * 2.f, 0.1, 1.9);
+ PVINNER->pParent->recalcSizePosRecursive(*PANIMATE == 0);
+ } else
+ PVOUTER->pParent->recalcSizePosRecursive(*PANIMATE == 0);
+ }
+ } else {
+ // get the correct containers to apply splitratio to
+ const auto PPARENT = PNODE->pParent;
- for (auto PCURRENT = PNODE; PCURRENT && PCURRENT->pParent; PCURRENT = PCURRENT->pParent) {
- const auto PPARENT = PCURRENT->pParent;
+ if (!PPARENT)
+ return; // the only window on a workspace, ignore
- if (!PVOUTER && PPARENT->splitTop && (NONE || (TOP && PPARENT->children[1] == PCURRENT) || (BOTTOM && PPARENT->children[0] == PCURRENT)))
- PVOUTER = PCURRENT;
- else if (!PVOUTER && !PVINNER && PPARENT->splitTop)
- PVINNER = PCURRENT;
- else if (!PHOUTER && !PPARENT->splitTop && (NONE || (LEFT && PPARENT->children[1] == PCURRENT) || (RIGHT && PPARENT->children[0] == PCURRENT)))
- PHOUTER = PCURRENT;
- else if (!PHOUTER && !PHINNER && !PPARENT->splitTop)
- PHINNER = PCURRENT;
+ const bool PARENTSIDEBYSIDE = !PPARENT->splitTop;
- if (PVOUTER && PHOUTER)
- break;
- }
+ // Get the parent's parent
+ auto PPARENT2 = PPARENT->pParent;
- if (PHOUTER) {
- PHOUTER->pParent->splitRatio = std::clamp(PHOUTER->pParent->splitRatio + allowedMovement.x * 2.f / PHOUTER->pParent->size.x, 0.1, 1.9);
+ // No parent means we have only 2 windows, and thus one axis of freedom
+ if (!PPARENT2) {
+ if (PARENTSIDEBYSIDE) {
+ allowedMovement.x *= 2.f / PPARENT->size.x;
+ PPARENT->splitRatio = std::clamp(PPARENT->splitRatio + allowedMovement.x, 0.1, 1.9);
+ PPARENT->recalcSizePosRecursive(*PANIMATE == 0);
+ } else {
+ allowedMovement.y *= 2.f / PPARENT->size.y;
+ PPARENT->splitRatio = std::clamp(PPARENT->splitRatio + allowedMovement.y, 0.1, 1.9);
+ PPARENT->recalcSizePosRecursive(*PANIMATE == 0);
+ }
- if (PHINNER) {
- const auto ORIGINAL = PHINNER->size.x;
- PHOUTER->pParent->recalcSizePosRecursive(*PANIMATE == 0);
- if (PHINNER->pParent->children[0] == PHINNER)
- PHINNER->pParent->splitRatio = std::clamp((ORIGINAL - allowedMovement.x) / PHINNER->pParent->size.x * 2.f, 0.1, 1.9);
- else
- PHINNER->pParent->splitRatio = std::clamp(2 - (ORIGINAL + allowedMovement.x) / PHINNER->pParent->size.x * 2.f, 0.1, 1.9);
- PHINNER->pParent->recalcSizePosRecursive(*PANIMATE == 0);
- } else
- PHOUTER->pParent->recalcSizePosRecursive(*PANIMATE == 0);
- }
+ return;
+ }
- if (PVOUTER) {
- PVOUTER->pParent->splitRatio = std::clamp(PVOUTER->pParent->splitRatio + allowedMovement.y * 2.f / PVOUTER->pParent->size.y, 0.1, 1.9);
+ // Get first parent with other split
+ while (PPARENT2 && PPARENT2->splitTop == !PARENTSIDEBYSIDE)
+ PPARENT2 = PPARENT2->pParent;
- if (PVINNER) {
- const auto ORIGINAL = PVINNER->size.y;
- PVOUTER->pParent->recalcSizePosRecursive(*PANIMATE == 0);
- if (PVINNER->pParent->children[0] == PVINNER)
- PVINNER->pParent->splitRatio = std::clamp((ORIGINAL - allowedMovement.y) / PVINNER->pParent->size.y * 2.f, 0.1, 1.9);
- else
- PVINNER->pParent->splitRatio = std::clamp(2 - (ORIGINAL + allowedMovement.y) / PVINNER->pParent->size.y * 2.f, 0.1, 1.9);
- PVINNER->pParent->recalcSizePosRecursive(*PANIMATE == 0);
- } else
- PVOUTER->pParent->recalcSizePosRecursive(*PANIMATE == 0);
+ // 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, 0.1, 1.9);
+ PPARENT->recalcSizePosRecursive(*PANIMATE == 0);
+ } else {
+ allowedMovement.y *= 2.f / PPARENT->size.y;
+ PPARENT->splitRatio = std::clamp(PPARENT->splitRatio + allowedMovement.y, 0.1, 1.9);
+ PPARENT->recalcSizePosRecursive(*PANIMATE == 0);
+ }
+
+ return;
+ }
+
+ // 2 axes of freedom
+ const auto SIDECONTAINER = PARENTSIDEBYSIDE ? PPARENT : PPARENT2;
+ const auto TOPCONTAINER = PARENTSIDEBYSIDE ? PPARENT2 : PPARENT;
+
+ allowedMovement.x *= 2.f / SIDECONTAINER->size.x;
+ allowedMovement.y *= 2.f / TOPCONTAINER->size.y;
+
+ SIDECONTAINER->splitRatio = std::clamp(SIDECONTAINER->splitRatio + allowedMovement.x, 0.1, 1.9);
+ TOPCONTAINER->splitRatio = std::clamp(TOPCONTAINER->splitRatio + allowedMovement.y, 0.1, 1.9);
+ SIDECONTAINER->recalcSizePosRecursive(*PANIMATE == 0);
+ TOPCONTAINER->recalcSizePosRecursive(*PANIMATE == 0);
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-11-02 18:17:47 +0000