diff options
| author | Tom Benham <38216488+tomben13@users.noreply.github.com> | 2024-03-04 18:05:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-04 17:05:20 +0000 |
| commit | 07c7235b7245375802c767472d62b776458c221d (patch) | |
| tree | 0142f781261616ff9d9c02d5a2855bb4ce1c31d8 /src/Compositor.cpp | |
| parent | 12da0fc84f8b084f7b13702b811cbed7dae9854c (diff) | |
keybinds: Better handling of workspace_back_and_forth (#4952)
* Removed redundant boolean condition
* Better handling of workspace_back_and_forth when using focusworkspaceoncurrentmonitor dispatcher
* Fixed config acquisition
---------
Co-authored-by: Tom Benham <tom.benham@quadrille.fr>
Diffstat (limited to 'src/Compositor.cpp')
| -rw-r--r-- | src/Compositor.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/Compositor.cpp b/src/Compositor.cpp index bb80f3ef..1f7f6182 100644 --- a/src/Compositor.cpp +++ b/src/Compositor.cpp @@ -2042,6 +2042,9 @@ void CCompositor::swapActiveWorkspaces(CMonitor* pMonitorA, CMonitor* pMonitorB) pMonitorA->activeWorkspace = PWORKSPACEB->m_iID; pMonitorB->activeWorkspace = PWORKSPACEA->m_iID; + PWORKSPACEA->rememberPrevWorkspace(PWORKSPACEB); + PWORKSPACEB->rememberPrevWorkspace(PWORKSPACEA); + g_pLayoutManager->getCurrentLayout()->recalculateMonitor(pMonitorA->ID); g_pLayoutManager->getCurrentLayout()->recalculateMonitor(pMonitorB->ID); @@ -2150,7 +2153,7 @@ void CCompositor::moveWorkspaceToMonitor(CWorkspace* pWorkspace, CMonitor* pMoni // fix old mon int nextWorkspaceOnMonitorID = -1; - if (!SWITCHINGISACTIVE || !POLDMON) + if (!SWITCHINGISACTIVE) nextWorkspaceOnMonitorID = pWorkspace->m_iID; else { for (auto& w : m_vWorkspaces) { |