hyprwm/Hyprland
1
1
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2024-12-20 22:22:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

added dwindle:preserve_split

Browse Source
This commit is contained in:
vaxerski 2022-05-16 17:27:55 +02:00
parent e991550abe
commit e90c1f7022
3 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/config/ConfigManager.cpp
View File

@ -47,6 +47,7 @@ void CConfigManager::setDefaultVars() {
configValues["dwindle:col.group_border"].intValue = 0x66777700; configValues["dwindle:col.group_border"].intValue = 0x66777700;
configValues["dwindle:col.group_border_active"].intValue = 0x66ffff00; configValues["dwindle:col.group_border_active"].intValue = 0x66ffff00;
configValues["dwindle:force_split"].intValue = 0; configValues["dwindle:force_split"].intValue = 0;
configValues["dwindle:preserve_split"].intValue = 0;
configValues["animations:enabled"].intValue = 1; configValues["animations:enabled"].intValue = 1;
configValues["animations:speed"].floatValue = 7.f; configValues["animations:speed"].floatValue = 7.f;

33
src/layout/DwindleLayout.cpp
View File

@ -23,7 +23,12 @@ void SDwindleNodeData::recalcSizePosRecursive() {
const auto REVERSESPLITRATIO = 2.f - splitRatio; 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 // split sidey
children[0]->position = position; children[0]->position = position;
children[0]->size = Vector2D(size.x / 2.f * splitRatio, size.y); 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 // if cursor over first child, make it first, etc
const auto SIDEBYSIDE = NEWPARENT->size.x / NEWPARENT->size.y > 1.f; const auto SIDEBYSIDE = NEWPARENT->size.x / NEWPARENT->size.y > 1.f;
NEWPARENT->splitTop = !SIDEBYSIDE;
const auto MOUSECOORDS = g_pInputManager->getMouseCoordsInternal(); const auto MOUSECOORDS = g_pInputManager->getMouseCoordsInternal();
const auto FORCESPLIT = g_pConfigManager->getInt("dwindle:force_split"); const auto FORCESPLIT = g_pConfigManager->getInt("dwindle:force_split");
@ -485,10 +491,10 @@ void CHyprDwindleLayout::onMouseMove(const Vector2D& mousePos) {
if (!PPARENT) if (!PPARENT)
return; // the only window on a workspace, ignore 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 // 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 // No parent means we have only 2 windows, and thus one axis of freedom
if (!PPARENT2) { if (!PPARENT2) {
@ -505,7 +511,26 @@ void CHyprDwindleLayout::onMouseMove(const Vector2D& mousePos) {
return; 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 SIDECONTAINER = PARENTSIDEBYSIDE ? PPARENT : PPARENT2;
const auto TOPCONTAINER = PARENTSIDEBYSIDE ? PPARENT2 : PPARENT; const auto TOPCONTAINER = PARENTSIDEBYSIDE ? PPARENT2 : PPARENT;

2
src/layout/DwindleLayout.hpp
View File

@ -14,6 +14,8 @@ struct SDwindleNodeData {
std::array<SDwindleNodeData*, 2> children = { nullptr, nullptr }; std::array<SDwindleNodeData*, 2> children = { nullptr, nullptr };
bool splitTop = false; // for preserve_split
bool isGroup = false; bool isGroup = false;
int groupMemberActive = 0; int groupMemberActive = 0;
std::deque<SDwindleNodeData*> groupMembers; std::deque<SDwindleNodeData*> groupMembers;