summaryrefslogtreecommitdiff
path: root/src/layout/MasterLayout.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/layout/MasterLayout.cpp')
-rw-r--r--src/layout/MasterLayout.cpp65
1 files changed, 40 insertions, 25 deletions
diff --git a/src/layout/MasterLayout.cpp b/src/layout/MasterLayout.cpp
index eebe787e..b1322d4b 100644
--- a/src/layout/MasterLayout.cpp
+++ b/src/layout/MasterLayout.cpp
@@ -153,6 +153,10 @@ void CHyprMasterLayout::onWindowRemovedTiling(CWindow* pWindow) {
if (!PNODE)
return;
+ const auto WORKSPACEID = PNODE->workspaceID;
+ const auto MASTERSLEFT = getMastersOnWorkspace(WORKSPACEID);
+ static const auto* SMALLSPLIT = &g_pConfigManager->getConfigValuePtr("master:allow_small_split")->intValue;
+
pWindow->m_sSpecialRenderData.rounding = true;
pWindow->m_sSpecialRenderData.border = true;
pWindow->m_sSpecialRenderData.decorate = true;
@@ -160,12 +164,10 @@ void CHyprMasterLayout::onWindowRemovedTiling(CWindow* pWindow) {
if (pWindow->m_bIsFullscreen)
g_pCompositor->setWindowFullscreen(pWindow, false, FULLSCREEN_FULL);
- const auto MASTERSLEFT = getMastersOnWorkspace(PNODE->workspaceID);
-
- if (PNODE->isMaster && MASTERSLEFT < 2) {
- // find new one
+ if (PNODE->isMaster && (MASTERSLEFT <= 1 || *SMALLSPLIT == 1)) {
+ // find a new master from top of the list
for (auto& nd : m_lMasterNodesData) {
- if (!nd.isMaster && nd.workspaceID == PNODE->workspaceID) {
+ if (!nd.isMaster && nd.workspaceID == WORKSPACEID) {
nd.isMaster = true;
nd.percMaster = PNODE->percMaster;
break;
@@ -173,8 +175,6 @@ void CHyprMasterLayout::onWindowRemovedTiling(CWindow* pWindow) {
}
}
- const auto WORKSPACEID = PNODE->workspaceID;
-
m_lMasterNodesData.remove(*PNODE);
if (getMastersOnWorkspace(WORKSPACEID) == getNodesOnWorkspace(WORKSPACEID) && MASTERSLEFT > 1) {
@@ -185,7 +185,16 @@ void CHyprMasterLayout::onWindowRemovedTiling(CWindow* pWindow) {
}
}
}
-
+ // BUGFIX: correct bug where closing one master in a stack of 2 would leave
+ // the screen half bare, and make it difficult to select remaining window
+ if (getNodesOnWorkspace(WORKSPACEID) == 1) {
+ for (auto& nd : m_lMasterNodesData) {
+ if (nd.workspaceID == WORKSPACEID && nd.isMaster == false) {
+ nd.isMaster = true;
+ break;
+ }
+ }
+ }
recalculateMonitor(pWindow->m_iMonitorID);
}
@@ -254,20 +263,26 @@ void CHyprMasterLayout::calculateWorkspace(const int& ws) {
}
}
- const auto MASTERS = getMastersOnWorkspace(PWORKSPACE->m_iID);
-
+ const auto MASTERS = getMastersOnWorkspace(PWORKSPACE->m_iID);
+ const auto WINDOWS = getNodesOnWorkspace(PWORKSPACE->m_iID);
+ const auto STACKWINDOWS = WINDOWS - MASTERS;
//compute placement of master window(s)
- if (getNodesOnWorkspace(PWORKSPACE->m_iID) < 2 && !centerMasterWindow) {
+ if ((WINDOWS < 2) && !centerMasterWindow) {
PMASTERNODE->position = PMONITOR->vecReservedTopLeft + PMONITOR->vecPosition;
PMASTERNODE->size = Vector2D(PMONITOR->vecSize.x - PMONITOR->vecReservedTopLeft.x - PMONITOR->vecReservedBottomRight.x,
PMONITOR->vecSize.y - PMONITOR->vecReservedBottomRight.y - PMONITOR->vecReservedTopLeft.y);
applyNodeDataToWindow(PMASTERNODE);
return;
- } else if (orientation == ORIENTATION_LEFT || orientation == ORIENTATION_RIGHT) {
- float heightLeft = PMONITOR->vecSize.y - PMONITOR->vecReservedBottomRight.y - PMONITOR->vecReservedTopLeft.y;
- int nodesLeft = MASTERS;
- float nextY = 0;
- const float WIDTH = (PMONITOR->vecSize.x - PMONITOR->vecReservedTopLeft.x - PMONITOR->vecReservedBottomRight.x) * PMASTERNODE->percMaster;
+ } else if (orientation == ORIENTATION_LEFT || orientation == ORIENTATION_RIGHT || (orientation == ORIENTATION_CENTER && STACKWINDOWS <= 1)) {
+ float heightLeft = PMONITOR->vecSize.y - PMONITOR->vecReservedBottomRight.y - PMONITOR->vecReservedTopLeft.y;
+ int nodesLeft = MASTERS;
+ float nextY = 0;
+ float WIDTH = 0;
+
+ if (STACKWINDOWS == 0 && MASTERS > 0)
+ WIDTH = (PMONITOR->vecSize.x - PMONITOR->vecReservedTopLeft.x - PMONITOR->vecReservedBottomRight.x);
+ else
+ WIDTH = (PMONITOR->vecSize.x - PMONITOR->vecReservedTopLeft.x - PMONITOR->vecReservedBottomRight.x) * PMASTERNODE->percMaster;
for (auto& n : m_lMasterNodesData) {
if (n.workspaceID == PWORKSPACE->m_iID && n.isMaster) {
@@ -315,7 +330,7 @@ void CHyprMasterLayout::calculateWorkspace(const int& ws) {
applyNodeDataToWindow(&n);
}
}
- } else if (orientation == ORIENTATION_CENTER) {
+ } else if (orientation == ORIENTATION_CENTER && STACKWINDOWS >= 2) {
float heightLeft = PMONITOR->vecSize.y - PMONITOR->vecReservedBottomRight.y - PMONITOR->vecReservedTopLeft.y;
int nodesLeft = MASTERS;
float nextY = 0;
@@ -341,7 +356,7 @@ void CHyprMasterLayout::calculateWorkspace(const int& ws) {
//compute placement of slave window(s)
int slavesLeft = getNodesOnWorkspace(PWORKSPACE->m_iID) - MASTERS;
- if (orientation == ORIENTATION_LEFT || orientation == ORIENTATION_RIGHT) {
+ if (orientation == ORIENTATION_LEFT || orientation == ORIENTATION_RIGHT || (orientation == ORIENTATION_CENTER && STACKWINDOWS <= 1)) {
float heightLeft = PMONITOR->vecSize.y - PMONITOR->vecReservedBottomRight.y - PMONITOR->vecReservedTopLeft.y;
float nextY = 0;
const float WIDTH = PMONITOR->vecSize.x - PMONITOR->vecReservedBottomRight.x - PMONITOR->vecReservedTopLeft.x - PMASTERNODE->size.x;
@@ -350,7 +365,7 @@ void CHyprMasterLayout::calculateWorkspace(const int& ws) {
if (nd.workspaceID != PWORKSPACE->m_iID || nd.isMaster)
continue;
- if (orientation == ORIENTATION_LEFT) {
+ if (orientation == ORIENTATION_LEFT || (orientation == ORIENTATION_CENTER && STACKWINDOWS <= 1)) {
nd.position = PMONITOR->vecReservedTopLeft + PMONITOR->vecPosition +
Vector2D(PMASTERNODE->percMaster * (PMONITOR->vecSize.x - PMONITOR->vecReservedTopLeft.x - PMONITOR->vecReservedBottomRight.x), nextY);
} else {
@@ -392,7 +407,7 @@ void CHyprMasterLayout::calculateWorkspace(const int& ws) {
applyNodeDataToWindow(&nd);
}
- } else if (orientation == ORIENTATION_CENTER) {
+ } else if (orientation == ORIENTATION_CENTER && STACKWINDOWS >= 2) {
float heightLeftL = PMONITOR->vecSize.y - PMONITOR->vecReservedBottomRight.y - PMONITOR->vecReservedTopLeft.y;
float heightLeftR = heightLeftL;
float heightLeft = 0;
@@ -951,14 +966,14 @@ std::any CHyprMasterLayout::layoutMessage(SLayoutMessageHeader header, std::stri
if (header.pWindow->m_bIsFloating)
return 0;
- const auto PNODE = getNodeFromWindow(header.pWindow);
+ const auto PNODE = getNodeFromWindow(header.pWindow);
- const auto WINDOWS = getNodesOnWorkspace(header.pWindow->m_iWorkspaceID);
- const auto MASTERS = getMastersOnWorkspace(header.pWindow->m_iWorkspaceID);
+ const auto WINDOWS = getNodesOnWorkspace(header.pWindow->m_iWorkspaceID);
+ const auto MASTERS = getMastersOnWorkspace(header.pWindow->m_iWorkspaceID);
+ static const auto* SMALLSPLIT = &g_pConfigManager->getConfigValuePtr("master:allow_small_split")->intValue;
- if (MASTERS + 2 > WINDOWS)
+ if (MASTERS + 2 > WINDOWS && *SMALLSPLIT == 0)
return 0;
-
prepareLoseFocus(header.pWindow);
if (!PNODE || PNODE->isMaster) {
generated by cgit v1.2.3 (git 2.25.1) at 2026-11-02 23:30:34 +0000