diff options
| author | Vaxry <43317083+vaxerski@users.noreply.github.com> | 2022-09-29 22:01:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-29 22:01:06 +0100 |
| commit | 45fe185cb9865e7da9f6c7fb8c7f497dfb029e50 (patch) | |
| tree | 5a6a01c18d309b146fda8e78557c51303872043a /src/layout/DwindleLayout.cpp | |
| parent | da40bf823f2f307e439f4bd85c405d9e612c2df5 (diff) | |
| parent | ab42e4bccf19083f2ffe93876128086b77788c8a (diff) | |
Merge pull request #736 from Dickby/fix_bordersize_again
Scale the border size, revert the window scaling according to border
Diffstat (limited to 'src/layout/DwindleLayout.cpp')
| -rw-r--r-- | src/layout/DwindleLayout.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/layout/DwindleLayout.cpp b/src/layout/DwindleLayout.cpp index ba59034c..df8b1616 100644 --- a/src/layout/DwindleLayout.cpp +++ b/src/layout/DwindleLayout.cpp @@ -182,16 +182,15 @@ void CHyprDwindleLayout::applyNodeDataToWindow(SDwindleNodeData* pNode, bool for PWINDOW->m_vPosition = pNode->position; static auto *const PNOGAPSWHENONLY = &g_pConfigManager->getConfigValuePtr("dwindle:no_gaps_when_only")->intValue; - float scaledBorderSize = *PBORDERSIZE / PMONITOR->scale; - auto calcPos = PWINDOW->m_vPosition + Vector2D(scaledBorderSize, scaledBorderSize); - auto calcSize = PWINDOW->m_vSize - Vector2D(2 * scaledBorderSize, 2 * scaledBorderSize); + auto calcPos = PWINDOW->m_vPosition + Vector2D(*PBORDERSIZE, *PBORDERSIZE); + auto calcSize = PWINDOW->m_vSize - Vector2D(2 * *PBORDERSIZE, 2 * *PBORDERSIZE); const auto NODESONWORKSPACE = getNodesOnWorkspace(PWINDOW->m_iWorkspaceID); if (*PNOGAPSWHENONLY && PWINDOW->m_iWorkspaceID != SPECIAL_WORKSPACE_ID && (NODESONWORKSPACE == 1 || (pNode->isGroupMember() && pNode->getGroupMemberCount() == NODESONWORKSPACE))) { - PWINDOW->m_vRealPosition = calcPos - Vector2D(scaledBorderSize, scaledBorderSize); - PWINDOW->m_vRealSize = calcSize + Vector2D(2 * scaledBorderSize, 2 * scaledBorderSize); + PWINDOW->m_vRealPosition = calcPos - Vector2D(*PBORDERSIZE, *PBORDERSIZE); + PWINDOW->m_vRealSize = calcSize + Vector2D(2 * *PBORDERSIZE, 2 * *PBORDERSIZE); PWINDOW->updateWindowDecos(); |