diff options
| author | Franz Berger <fberger.work@gmail.com> | 2023-06-06 09:48:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-06 09:48:07 +0200 |
| commit | 4afeedbd567ca2114f682f14a6de26d4a8188878 (patch) | |
| tree | a93e2b085a543492ce9ec4b9b2124d88133ca7e7 /src/Window.cpp | |
| parent | 10db5a4fdbb0150af1165ea5591081c5182bb416 (diff) | |
Fix fractional scale updates in some cases (#2447)
* fix fractional scale update in moveWorkspaceToMonitor
* fix fractional scale update in moveToWorkspace
* Revert "fix fractional scale update in moveWorkspaceToMonitor"
This reverts commit 6612197a38e6e55a730bb786ed12861830e9f40e.
* Revert "fix fractional scale update in moveToWorkspace"
This reverts commit 75d9795a065c0122e42d622fbeb83b18c47d4bbc.
* move fractional scale code to updateSurfaceOutputs
* remove duplicate check
* remove superfluous setPreferredScale()
Diffstat (limited to 'src/Window.cpp')
| -rw-r--r-- | src/Window.cpp | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/src/Window.cpp b/src/Window.cpp index ce3ee967..7fe83ecc 100644 --- a/src/Window.cpp +++ b/src/Window.cpp @@ -283,6 +283,14 @@ void CWindow::updateSurfaceOutputs() { wlr_surface_for_each_surface(m_pWLSurface.wlr(), sendLeaveIter, PLASTMONITOR->output); wlr_surface_for_each_surface(m_pWLSurface.wlr(), sendEnterIter, PNEWMONITOR->output); + + wlr_surface_for_each_surface( + m_pWLSurface.wlr(), + [](wlr_surface* surf, int x, int y, void* data) { + const auto PMONITOR = g_pCompositor->getMonitorFromID(((CWindow*)data)->m_iMonitorID); + g_pProtocolManager->m_pFractionalScaleProtocolManager->setPreferredScaleForSurface(surf, PMONITOR ? PMONITOR->scale : 1.f); + }, + this); } void CWindow::moveToWorkspace(int workspaceID) { @@ -291,7 +299,6 @@ void CWindow::moveToWorkspace(int workspaceID) { m_iWorkspaceID = workspaceID; - const auto PMONITOR = g_pCompositor->getMonitorFromID(m_iMonitorID); const auto PWORKSPACE = g_pCompositor->getWorkspaceByID(m_iWorkspaceID); if (PWORKSPACE) { @@ -303,20 +310,6 @@ void CWindow::moveToWorkspace(int workspaceID) { m_pSwallowed->moveToWorkspace(workspaceID); m_pSwallowed->m_iMonitorID = m_iMonitorID; } - - if (PMONITOR) - g_pProtocolManager->m_pFractionalScaleProtocolManager->setPreferredScaleForSurface(m_pWLSurface.wlr(), PMONITOR->scale); - - if (!m_bIsMapped) - return; - - wlr_surface_for_each_surface( - m_pWLSurface.wlr(), - [](wlr_surface* surf, int x, int y, void* data) { - const auto PMONITOR = g_pCompositor->getMonitorFromID(((CWindow*)data)->m_iMonitorID); - g_pProtocolManager->m_pFractionalScaleProtocolManager->setPreferredScaleForSurface(surf, PMONITOR ? PMONITOR->scale : 1.f); - }, - this); } CWindow* CWindow::X11TransientFor() { |