diff options
| author | Dickby <felix.dick@web.de> | 2022-09-25 12:42:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-25 12:42:39 +0200 |
| commit | c885afcbc63cd3afd7ecf8c6ee45a908cdf6249f (patch) | |
| tree | 709507718d9665044a63aa678ac98a1181bef9b4 /src/layout/MasterLayout.cpp | |
| parent | fad5fc587d4281a5d399e61dc1243bc333d94d4d (diff) | |
Scale border size in calculations of windows
Diffstat (limited to 'src/layout/MasterLayout.cpp')
| -rw-r--r-- | src/layout/MasterLayout.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/layout/MasterLayout.cpp b/src/layout/MasterLayout.cpp index 0c1d1dd1..0a1c5179 100644 --- a/src/layout/MasterLayout.cpp +++ b/src/layout/MasterLayout.cpp @@ -133,7 +133,7 @@ void CHyprMasterLayout::recalculateMonitor(const int& monid) { } if (PWORKSPACE->m_bHasFullscreenWindow) { - if (PWORKSPACE->m_efFullscreenMode == FULLSCREEN_FULL) + if (PWORKSPACE->m_efFullscreenMode == FULLSCREEN_FULL) return; // massive hack from the fullscreen func @@ -241,12 +241,14 @@ void CHyprMasterLayout::applyNodeDataToWindow(SMasterNodeData* pNode) { PWINDOW->m_vSize = pNode->size; PWINDOW->m_vPosition = pNode->position; - auto calcPos = PWINDOW->m_vPosition + Vector2D(*PBORDERSIZE, *PBORDERSIZE); - auto calcSize = PWINDOW->m_vSize - Vector2D(2 * *PBORDERSIZE, 2 * *PBORDERSIZE); + float scaledBorderSize = *PBORDERSIZE / PMONITOR->scale; + + auto calcPos = PWINDOW->m_vPosition + Vector2D(scaledBorderSize, scaledBorderSize); + auto calcSize = PWINDOW->m_vSize - Vector2D(2 * scaledBorderSize, 2 * scaledBorderSize); if (*PNOGAPSWHENONLY && PWINDOW->m_iWorkspaceID != SPECIAL_WORKSPACE_ID && getNodesOnWorkspace(PWINDOW->m_iWorkspaceID) == 1) { - PWINDOW->m_vRealPosition = calcPos - Vector2D(*PBORDERSIZE, *PBORDERSIZE); - PWINDOW->m_vRealSize = calcSize + Vector2D(2 * *PBORDERSIZE, 2 * *PBORDERSIZE); + PWINDOW->m_vRealPosition = calcPos - Vector2D(scaledBorderSize, scaledBorderSize); + PWINDOW->m_vRealSize = calcSize + Vector2D(2 * scaledBorderSize, 2 * scaledBorderSize); PWINDOW->updateWindowDecos(); @@ -612,4 +614,4 @@ void CHyprMasterLayout::onEnable() { void CHyprMasterLayout::onDisable() { m_lMasterNodesData.clear(); -}
\ No newline at end of file +} |