diff options
| author | vaxerski <43317083+vaxerski@users.noreply.github.com> | 2022-05-12 13:03:02 +0200 |
|---|---|---|
| committer | vaxerski <43317083+vaxerski@users.noreply.github.com> | 2022-05-12 13:03:02 +0200 |
| commit | d4d72ae54d1426e0f4573319427f6ea53ef27b19 (patch) | |
| tree | e36bfbc0a416458d904477b48f91b8bab6db455b /src/managers/KeybindManager.cpp | |
| parent | 15f788677735ea6b9e21a735b93fc8492a68a7ae (diff) | |
Workspaceanim: respect stack order
Diffstat (limited to 'src/managers/KeybindManager.cpp')
| -rw-r--r-- | src/managers/KeybindManager.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp index 3a354f23..c41f552a 100644 --- a/src/managers/KeybindManager.cpp +++ b/src/managers/KeybindManager.cpp @@ -204,11 +204,14 @@ void CKeybindManager::changeworkspace(std::string args) { g_pCompositor->fixXWaylandWindowsOnWorkspace(PMONITOR->activeWorkspace); // here and only here begin anim. we don't want to anim visible workspaces on other monitors. + // check if anim left or right + const auto ANIMTOLEFT = workspaceToChangeTo > OLDWORKSPACEID; + // start anim on old workspace - g_pCompositor->getWorkspaceByID(OLDWORKSPACEID)->m_vRenderOffset = Vector2D(-PMONITOR->vecSize.x, 0); + g_pCompositor->getWorkspaceByID(OLDWORKSPACEID)->m_vRenderOffset = Vector2D(ANIMTOLEFT ? -PMONITOR->vecSize.x : PMONITOR->vecSize.x, 0); // start anim on new workspace - g_pCompositor->getWorkspaceByID(workspaceToChangeTo)->m_vRenderOffset.setValueAndWarp(Vector2D(PMONITOR->vecSize.x, 0)); + g_pCompositor->getWorkspaceByID(workspaceToChangeTo)->m_vRenderOffset.setValueAndWarp(Vector2D(ANIMTOLEFT ? PMONITOR->vecSize.x : -PMONITOR->vecSize.x, 0)); g_pCompositor->getWorkspaceByID(workspaceToChangeTo)->m_vRenderOffset = Vector2D(0, 0); } @@ -242,14 +245,17 @@ void CKeybindManager::changeworkspace(std::string args) { const auto OLDWORKSPACE = PMONITOR->activeWorkspace; + // get anim direction + const auto ANIMTOLEFT = workspaceToChangeTo > OLDWORKSPACE; + // start anim on old workspace - g_pCompositor->getWorkspaceByID(OLDWORKSPACE)->m_vRenderOffset = Vector2D(-PMONITOR->vecSize.x, 0); + g_pCompositor->getWorkspaceByID(OLDWORKSPACE)->m_vRenderOffset = Vector2D(ANIMTOLEFT ? -PMONITOR->vecSize.x : PMONITOR->vecSize.x, 0); g_pCompositor->m_lWorkspaces.emplace_back(PMONITOR->ID); const auto PWORKSPACE = &g_pCompositor->m_lWorkspaces.back(); // start anim on new workspace - PWORKSPACE->m_vRenderOffset.setValueAndWarp(Vector2D(PMONITOR->vecSize.x, 0)); + PWORKSPACE->m_vRenderOffset.setValueAndWarp(Vector2D(ANIMTOLEFT ? PMONITOR->vecSize.x : -PMONITOR->vecSize.x, 0)); PWORKSPACE->m_vRenderOffset = Vector2D(0, 0); // We are required to set the name here immediately |