summaryrefslogtreecommitdiff
path: root/src/managers/KeybindManager.cpp
diff options
context:
space:
mode:
authorvaxerski <vaxry@vaxry.net>2022-09-20 10:16:58 +0100
committervaxerski <vaxry@vaxry.net>2022-09-20 10:16:58 +0100
commitcde624ec6a98b751e67967cbaffd68b1215e8531 (patch)
tree3b38f710aa30efa1060581509aaeef767e749b44 /src/managers/KeybindManager.cpp
parentb82621c4ecd2697ac397ca0e47d5d75bf028632a (diff)
fix moving between fullscreen workspaces
Diffstat (limited to 'src/managers/KeybindManager.cpp')
-rw-r--r--src/managers/KeybindManager.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp
index 58da358c..65e6e5e8 100644
--- a/src/managers/KeybindManager.cpp
+++ b/src/managers/KeybindManager.cpp
@@ -825,17 +825,13 @@ void CKeybindManager::moveActiveToWorkspace(std::string args) {
PWINDOW->moveToWorkspace(PWORKSPACE->m_iID);
PWINDOW->m_iMonitorID = PWORKSPACE->m_iMonitorID;
- PWINDOW->m_bIsFullscreen = false;
- if (PWORKSPACE->m_bHasFullscreenWindow) {
- g_pCompositor->getFullscreenWindowOnWorkspace(PWORKSPACE->m_iID)->m_bIsFullscreen = false;
- PWORKSPACE->m_bHasFullscreenWindow = false;
+ if (PWINDOW->m_bIsFullscreen) {
+ g_pCompositor->setWindowFullscreen(PWINDOW, false, FULLSCREEN_FULL);
}
- if (PWINDOW->m_bIsFullscreen) {
- PWINDOW->m_bIsFullscreen = false;
- PSAVEDPOS = PSAVEDPOS + Vector2D(10, 10);
- PSAVEDSIZE = PSAVEDSIZE - Vector2D(20, 20);
+ if (PWORKSPACE->m_bHasFullscreenWindow) {
+ g_pCompositor->setWindowFullscreen(g_pCompositor->getFullscreenWindowOnWorkspace(PWORKSPACE->m_iID), false, FULLSCREEN_FULL);
}
// Hack: So that the layout doesnt find our window at the cursor