summaryrefslogtreecommitdiff
path: root/src/Compositor.cpp
diff options
context:
space:
mode:
authorscorpion-26 <dev.scorpion26@gmail.com>2023-04-30 00:39:09 +0200
committerGitHub <noreply@github.com>2023-04-29 23:39:09 +0100
commitfdb772832f8804ec986a08c3489252c36356e954 (patch)
tree17faf60e931b78d69fb2e3ce87015261da4b37d4 /src/Compositor.cpp
parent5c3684d0cce9b22364afd3515b9b42fb95417d84 (diff)
Keep fullscreen mode in moveWindowToWorkspaceSafe (#2191)
Moving a maximised window would always result in the window being fullscreen instead of maximised
Diffstat (limited to 'src/Compositor.cpp')
-rw-r--r--src/Compositor.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 414020b5..9eda8e3b 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -2348,7 +2348,8 @@ void CCompositor::moveWindowToWorkspaceSafe(CWindow* pWindow, CWorkspace* pWorks
if (!pWindow || !pWorkspace)
return;
- const bool FULLSCREEN = pWindow->m_bIsFullscreen;
+ const bool FULLSCREEN = pWindow->m_bIsFullscreen;
+ const auto FULLSCREENMODE = getWorkspaceByID(pWindow->m_iWorkspaceID)->m_efFullscreenMode;
if (FULLSCREEN)
setWindowFullscreen(pWindow, false, FULLSCREEN_FULL);
@@ -2374,5 +2375,5 @@ void CCompositor::moveWindowToWorkspaceSafe(CWindow* pWindow, CWorkspace* pWorks
}
if (FULLSCREEN)
- setWindowFullscreen(pWindow, true, FULLSCREEN_FULL);
+ setWindowFullscreen(pWindow, true, FULLSCREENMODE);
}