diff options
| author | Vaxry <43317083+vaxerski@users.noreply.github.com> | 2023-09-20 16:47:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-20 16:47:05 +0100 |
| commit | 0dbd9970031940b50f9cce4c88989c2830d2a15f (patch) | |
| tree | 0dd50dd13e19e663444b1e78d14104c40dabbf76 /src/Compositor.cpp | |
| parent | 3785defaf12b9d99137b2f4c74ab82c51cf733e1 (diff) | |
input: Various constraint handling fixes (#3381)
Fixes #3204
Diffstat (limited to 'src/Compositor.cpp')
| -rw-r--r-- | src/Compositor.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/Compositor.cpp b/src/Compositor.cpp index e2b920c2..99e62a46 100644 --- a/src/Compositor.cpp +++ b/src/Compositor.cpp @@ -875,7 +875,7 @@ void CCompositor::focusWindow(CWindow* pWindow, wlr_surface* pSurface) { const auto PWORKSPACE = getWorkspaceByID(pWindow->m_iWorkspaceID); PWORKSPACE->m_pLastFocusedWindow = pWindow; PWORKSPACE->rememberPrevWorkspace(getWorkspaceByID(m_pLastMonitor->activeWorkspace)); - const auto PMONITOR = getMonitorFromID(PWORKSPACE->m_iMonitorID); + const auto PMONITOR = getMonitorFromID(PWORKSPACE->m_iMonitorID); PMONITOR->changeWorkspace(PWORKSPACE, false, true); // changeworkspace already calls focusWindow return; @@ -2530,5 +2530,10 @@ void CCompositor::arrangeMonitors() { Debug::log(LOG, "arrangeMonitors: {} xwayland [{}, {:.2f}]", m->szName, maxOffset, 0.f); m->vecXWaylandPosition = {maxOffset, 0}; maxOffset += (*PXWLFORCESCALEZERO ? m->vecTransformedSize.x : m->vecSize.x); + + if (*PXWLFORCESCALEZERO) + m->xwaylandScale = m->scale; + else + m->xwaylandScale = 1.f; } } |