add general:allow_workspace_cycles option

This commit is contained in:
Charles Taylor
2022-08-21 20:47:56 +10:00
parent d6ff7e40cf
commit 9ee42836d5
2 changed files with 9 additions and 4 deletions

View File

@@ -476,8 +476,10 @@ void CKeybindManager::changeworkspace(std::string args) {
workspaceToChangeTo = P_CURRENT_WORKSPACE->m_iPrevWorkspaceID;
isSwitchingToPrevious = true;
// TODO: Add support for cycles
P_CURRENT_WORKSPACE->m_iPrevWorkspaceID = -1;
// If the previous workspace ID isn't reset, cycles can form when continually going
// to the previous workspace again and again.
if (!g_pConfigManager->getConfigValuePtr("general:allow_workspace_cycles")->intValue)
P_CURRENT_WORKSPACE->m_iPrevWorkspaceID = -1;
}
} else {
workspaceToChangeTo = getWorkspaceIDFromString(args, workspaceName);
@@ -499,8 +501,10 @@ void CKeybindManager::changeworkspace(std::string args) {
workspaceToChangeTo = P_CURRENT_WORKSPACE->m_iPrevWorkspaceID;
isSwitchingToPrevious = true;
// TODO: Add support for cycles
P_CURRENT_WORKSPACE->m_iPrevWorkspaceID = -1;
// If the previous workspace ID isn't reset, cycles can form when continually going
// to the previous workspace again and again.
if (!g_pConfigManager->getConfigValuePtr("general:allow_workspace_cycles")->intValue)
P_CURRENT_WORKSPACE->m_iPrevWorkspaceID = -1;
}
// remove constraints