mirror of
https://github.com/hyprwm/Hyprland
synced 2024-12-23 04:49:48 +01:00
add config option to enable/disable new intuitive resizing (#2774)
dwindle:smart_resizing = 1 by default == 1 then use new resizing else use old resizing
This commit is contained in:
parent
d3bba2489d
commit
9845f99b60
2 changed files with 110 additions and 50 deletions
|
@ -160,6 +160,7 @@ void CConfigManager::setDefaultVars() {
|
||||||
configValues["dwindle:use_active_for_splits"].intValue = 1;
|
configValues["dwindle:use_active_for_splits"].intValue = 1;
|
||||||
configValues["dwindle:default_split_ratio"].floatValue = 1.f;
|
configValues["dwindle:default_split_ratio"].floatValue = 1.f;
|
||||||
configValues["dwindle:smart_split"].intValue = 0;
|
configValues["dwindle:smart_split"].intValue = 0;
|
||||||
|
configValues["dwindle:smart_resizing"].intValue = 1;
|
||||||
|
|
||||||
configValues["master:special_scale_factor"].floatValue = 0.8f;
|
configValues["master:special_scale_factor"].floatValue = 0.8f;
|
||||||
configValues["master:mfact"].floatValue = 0.55f;
|
configValues["master:mfact"].floatValue = 0.55f;
|
||||||
|
|
|
@ -318,7 +318,7 @@ void CHyprDwindleLayout::onWindowCreatedTiling(CWindow* pWindow) {
|
||||||
|
|
||||||
// if it's a group, add the window
|
// if it's a group, add the window
|
||||||
if (OPENINGON->pWindow->m_sGroupData.pNextWindow && !OPENINGON->pWindow->getGroupHead()->m_sGroupData.locked &&
|
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
|
if (!pWindow->m_sGroupData.pNextWindow) { // source is not a group
|
||||||
m_lDwindleNodesData.remove(*PNODE);
|
m_lDwindleNodesData.remove(*PNODE);
|
||||||
|
@ -606,7 +606,8 @@ void CHyprDwindleLayout::resizeActiveWindow(const Vector2D& pixResize, eRectCorn
|
||||||
return;
|
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
|
// get some data about our window
|
||||||
const auto PMONITOR = g_pCompositor->getMonitorFromID(PWINDOW->m_iMonitorID);
|
const auto PMONITOR = g_pCompositor->getMonitorFromID(PWINDOW->m_iMonitorID);
|
||||||
|
@ -661,63 +662,121 @@ void CHyprDwindleLayout::resizeActiveWindow(const Vector2D& pixResize, eRectCorn
|
||||||
if (DISPLAYBOTTOM && DISPLAYTOP)
|
if (DISPLAYBOTTOM && DISPLAYTOP)
|
||||||
allowedMovement.y = 0;
|
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;
|
||||||
|
|
||||||
SDwindleNodeData* PVOUTER = nullptr;
|
const auto LEFT = corner == CORNER_TOPLEFT || corner == CORNER_BOTTOMLEFT;
|
||||||
SDwindleNodeData* PVINNER = nullptr;
|
const auto TOP = corner == CORNER_TOPLEFT || corner == CORNER_TOPRIGHT;
|
||||||
SDwindleNodeData* PHOUTER = nullptr;
|
const auto RIGHT = corner == CORNER_TOPRIGHT || corner == CORNER_BOTTOMRIGHT;
|
||||||
SDwindleNodeData* PHINNER = nullptr;
|
const auto BOTTOM = corner == CORNER_BOTTOMLEFT || corner == CORNER_BOTTOMRIGHT;
|
||||||
|
const auto NONE = corner == CORNER_NONE;
|
||||||
|
|
||||||
const auto LEFT = corner == CORNER_TOPLEFT || corner == CORNER_BOTTOMLEFT;
|
for (auto PCURRENT = PNODE; PCURRENT && PCURRENT->pParent; PCURRENT = PCURRENT->pParent) {
|
||||||
const auto TOP = corner == CORNER_TOPLEFT || corner == CORNER_TOPRIGHT;
|
const auto PPARENT = PCURRENT->pParent;
|
||||||
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) {
|
if (!PVOUTER && PPARENT->splitTop && (NONE || (TOP && PPARENT->children[1] == PCURRENT) || (BOTTOM && PPARENT->children[0] == PCURRENT)))
|
||||||
const auto PPARENT = PCURRENT->pParent;
|
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 && PPARENT->splitTop && (NONE || (TOP && PPARENT->children[1] == PCURRENT) || (BOTTOM && PPARENT->children[0] == PCURRENT)))
|
if (PVOUTER && PHOUTER)
|
||||||
PVOUTER = PCURRENT;
|
break;
|
||||||
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)
|
if (PHOUTER) {
|
||||||
break;
|
PHOUTER->pParent->splitRatio = std::clamp(PHOUTER->pParent->splitRatio + allowedMovement.x * 2.f / PHOUTER->pParent->size.x, 0.1, 1.9);
|
||||||
}
|
|
||||||
|
|
||||||
if (PHOUTER) {
|
if (PHINNER) {
|
||||||
PHOUTER->pParent->splitRatio = std::clamp(PHOUTER->pParent->splitRatio + allowedMovement.x * 2.f / PHOUTER->pParent->size.x, 0.1, 1.9);
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
if (PHINNER) {
|
if (PVOUTER) {
|
||||||
const auto ORIGINAL = PHINNER->size.x;
|
PVOUTER->pParent->splitRatio = std::clamp(PVOUTER->pParent->splitRatio + allowedMovement.y * 2.f / PVOUTER->pParent->size.y, 0.1, 1.9);
|
||||||
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);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (PVOUTER) {
|
if (PVINNER) {
|
||||||
PVOUTER->pParent->splitRatio = std::clamp(PVOUTER->pParent->splitRatio + allowedMovement.y * 2.f / PVOUTER->pParent->size.y, 0.1, 1.9);
|
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;
|
||||||
|
|
||||||
if (PVINNER) {
|
if (!PPARENT)
|
||||||
const auto ORIGINAL = PVINNER->size.y;
|
return; // the only window on a workspace, ignore
|
||||||
PVOUTER->pParent->recalcSizePosRecursive(*PANIMATE == 0);
|
|
||||||
if (PVINNER->pParent->children[0] == PVINNER)
|
const bool PARENTSIDEBYSIDE = !PPARENT->splitTop;
|
||||||
PVINNER->pParent->splitRatio = std::clamp((ORIGINAL - allowedMovement.y) / PVINNER->pParent->size.y * 2.f, 0.1, 1.9);
|
|
||||||
else
|
// Get the parent's parent
|
||||||
PVINNER->pParent->splitRatio = std::clamp(2 - (ORIGINAL + allowedMovement.y) / PVINNER->pParent->size.y * 2.f, 0.1, 1.9);
|
auto PPARENT2 = PPARENT->pParent;
|
||||||
PVINNER->pParent->recalcSizePosRecursive(*PANIMATE == 0);
|
|
||||||
} else
|
// No parent means we have only 2 windows, and thus one axis of freedom
|
||||||
PVOUTER->pParent->recalcSizePosRecursive(*PANIMATE == 0);
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 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, 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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue