twin/hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2025-08-15 03:55:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix crash with null pmonitor in special nodes on dwindle

Browse Source
This commit is contained in:
vaxerski
2022-07-03 23:14:51 +02:00
parent 01228fbc9c
commit a229701f28
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/layout/DwindleLayout.cpp
View File

@@ -93,6 +93,10 @@ SDwindleNodeData* CHyprDwindleLayout::getMasterNodeOnWorkspace(const int& id) {
} }
void CHyprDwindleLayout::applyNodeDataToWindow(SDwindleNodeData* pNode) { void CHyprDwindleLayout::applyNodeDataToWindow(SDwindleNodeData* pNode) {
// Don't set nodes, only windows.
if (pNode->isNode)
return;
const auto PMONITOR = g_pCompositor->getMonitorFromID(g_pCompositor->getWorkspaceByID(pNode->workspaceID)->m_iMonitorID); const auto PMONITOR = g_pCompositor->getMonitorFromID(g_pCompositor->getWorkspaceByID(pNode->workspaceID)->m_iMonitorID);
if (!PMONITOR) { if (!PMONITOR) {
@@ -100,10 +104,6 @@ void CHyprDwindleLayout::applyNodeDataToWindow(SDwindleNodeData* pNode) {
return; return;
} }
// Don't set nodes, only windows.
if (pNode->isNode)
return;
// for gaps outer // for gaps outer
const bool DISPLAYLEFT = STICKS(pNode->position.x, PMONITOR->vecPosition.x + PMONITOR->vecReservedTopLeft.x); const bool DISPLAYLEFT = STICKS(pNode->position.x, PMONITOR->vecPosition.x + PMONITOR->vecReservedTopLeft.x);
const bool DISPLAYRIGHT = STICKS(pNode->position.x + pNode->size.x, PMONITOR->vecPosition.x + PMONITOR->vecSize.x - PMONITOR->vecReservedBottomRight.x); const bool DISPLAYRIGHT = STICKS(pNode->position.x + pNode->size.x, PMONITOR->vecPosition.x + PMONITOR->vecSize.x - PMONITOR->vecReservedBottomRight.x);