diff options
Diffstat (limited to 'src/managers/KeybindManager.cpp')
| -rw-r--r-- | src/managers/KeybindManager.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp index 8d09d650..b1b51dd7 100644 --- a/src/managers/KeybindManager.cpp +++ b/src/managers/KeybindManager.cpp @@ -496,11 +496,15 @@ void CKeybindManager::changeworkspace(std::string args) { // to a previous workspace. bool isSwitchingToPrevious = false; + bool internal = false; + if (args.find("[internal]") == 0) { workspaceToChangeTo = std::stoi(args.substr(10)); const auto PWORKSPACE = g_pCompositor->getWorkspaceByID(workspaceToChangeTo); if (PWORKSPACE) workspaceName = PWORKSPACE->m_szName; + + internal = true; } else if (args.find("previous") == 0) { const auto PCURRENTWORKSPACE = g_pCompositor->getWorkspaceByID( g_pCompositor->m_pLastMonitor->activeWorkspace); @@ -551,6 +555,10 @@ void CKeybindManager::changeworkspace(std::string args) { // remove constraints g_pInputManager->unconstrainMouse(); + // if it's not internal, we will unfocus to prevent stuck focus + if (!internal) + g_pCompositor->focusWindow(nullptr); + // if it exists, we warp to it if (g_pCompositor->getWorkspaceByID(workspaceToChangeTo)) { const auto PMONITOR = g_pCompositor->getMonitorFromID(g_pCompositor->getWorkspaceByID(workspaceToChangeTo)->m_iMonitorID); |