summaryrefslogtreecommitdiff
path: root/src/managers/KeybindManager.cpp
diff options
context:
space:
mode:
authorvaxerski <vaxry@vaxry.net>2022-09-19 16:01:42 +0100
committervaxerski <vaxry@vaxry.net>2022-09-19 16:01:42 +0100
commit696253b3489fb57904b500b8265dfaf19ada56d6 (patch)
tree35284231b85b83bcd6f4ec46e7c21dc0fff17b40 /src/managers/KeybindManager.cpp
parentabb6db9c379737bf36009f0de35cfd8f1198852f (diff)
fix special workspace dispatcher logic
Diffstat (limited to 'src/managers/KeybindManager.cpp')
-rw-r--r--src/managers/KeybindManager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp
index 1b5ff4a5..9b4827c9 100644
--- a/src/managers/KeybindManager.cpp
+++ b/src/managers/KeybindManager.cpp
@@ -589,7 +589,7 @@ void CKeybindManager::changeworkspace(std::string args) {
if (!*PALLOWWORKSPACECYCLES)
PCURRENTWORKSPACE->m_iPrevWorkspaceID = -1;
- } else if (PCURRENTWORKSPACE->m_iID == workspaceToChangeTo)
+ } else if (PCURRENTWORKSPACE->m_iID == workspaceToChangeTo && !internal)
return;
// remove constraints
@@ -840,10 +840,10 @@ void CKeybindManager::moveActiveToWorkspace(std::string args) {
for (auto& m : g_pCompositor->m_vMonitors)
m->specialWorkspaceOpen = false;
+ } else {
+ g_pCompositor->focusWindow(PWINDOW);
}
- g_pCompositor->focusWindow(PWINDOW);
-
PWINDOW->updateToplevel();
}