diff options
| author | vaxerski <43317083+vaxerski@users.noreply.github.com> | 2023-09-28 17:49:33 +0100 |
|---|---|---|
| committer | vaxerski <43317083+vaxerski@users.noreply.github.com> | 2023-09-28 17:49:40 +0100 |
| commit | 1f4eab176ef8978e022ea9367f9b7fb61273f163 (patch) | |
| tree | 5b03bfdd54e5c97ae68c9cdbeafe54e43df316bd /src/Compositor.cpp | |
| parent | 6d7dc70f663891ef39dcfb8ba8e5ff643b4d9ed8 (diff) | |
layout: don't discard fullscreen on new tiling
Diffstat (limited to 'src/Compositor.cpp')
| -rw-r--r-- | src/Compositor.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Compositor.cpp b/src/Compositor.cpp index 4ddac879..0672a543 100644 --- a/src/Compositor.cpp +++ b/src/Compositor.cpp @@ -2148,14 +2148,16 @@ void CCompositor::setWindowFullscreen(CWindow* pWindow, bool on, eFullscreenMode const auto PWORKSPACE = getWorkspaceByID(pWindow->m_iWorkspaceID); + const auto MODE = mode == FULLSCREEN_INVALID ? PWORKSPACE->m_efFullscreenMode : mode; + if (PWORKSPACE->m_bHasFullscreenWindow && on) { Debug::log(LOG, "Rejecting fullscreen ON on a fullscreen workspace"); return; } - g_pLayoutManager->getCurrentLayout()->fullscreenRequestForWindow(pWindow, mode, on); + g_pLayoutManager->getCurrentLayout()->fullscreenRequestForWindow(pWindow, MODE, on); - g_pXWaylandManager->setWindowFullscreen(pWindow, pWindow->m_bIsFullscreen && mode == FULLSCREEN_FULL); + g_pXWaylandManager->setWindowFullscreen(pWindow, pWindow->m_bIsFullscreen && MODE == FULLSCREEN_FULL); pWindow->updateDynamicRules(); updateWindowAnimatedDecorationValues(pWindow); |