Merge branch 'main' into wrap-surfaces

1 files changed, 15 insertions, 11 deletions

diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 497f26d8..924de252 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -1714,6 +1714,11 @@ void CCompositor::swapActiveWorkspaces(CMonitor* pMonitorA, CMonitor* pMonitorB)
 
     for (auto& w : m_vWindows) {
         if (w->m_iWorkspaceID == PWORKSPACEA->m_iID) {
+            if (w->m_bPinned) {
+                w->m_iWorkspaceID = PWORKSPACEB->m_iID;
+                continue;
+            }
+
             w->m_iMonitorID = pMonitorB->ID;
 
             // additionally, move floating and fs windows manually
@@ -1734,6 +1739,11 @@ void CCompositor::swapActiveWorkspaces(CMonitor* pMonitorA, CMonitor* pMonitorB)
 
     for (auto& w : m_vWindows) {
         if (w->m_iWorkspaceID == PWORKSPACEB->m_iID) {
+            if (w->m_bPinned) {
+                w->m_iWorkspaceID = PWORKSPACEA->m_iID;
+                continue;
+            }
+
             w->m_iMonitorID = pMonitorA->ID;
 
             // additionally, move floating and fs windows manually
@@ -1749,17 +1759,6 @@ void CCompositor::swapActiveWorkspaces(CMonitor* pMonitorA, CMonitor* pMonitorB)
         }
     }
 
-    // fix pinned windows
-    for (auto& w : g_pCompositor->m_vWindows) {
-        if (w->m_iWorkspaceID == pMonitorA->activeWorkspace && w->m_bPinned) {
-            w->m_iWorkspaceID = PWORKSPACEB->m_iID;
-        }
-
-        if (w->m_iWorkspaceID == pMonitorB->activeWorkspace && w->m_bPinned) {
-            w->m_iWorkspaceID = PWORKSPACEA->m_iID;
-        }
-    }
-
     pMonitorA->activeWorkspace = PWORKSPACEB->m_iID;
     pMonitorB->activeWorkspace = PWORKSPACEA->m_iID;
 
@@ -1909,6 +1908,11 @@ void CCompositor::moveWorkspaceToMonitor(CWorkspace* pWorkspace, CMonitor* pMoni
 
     for (auto& w : m_vWindows) {
         if (w->m_iWorkspaceID == pWorkspace->m_iID) {
+            if (w->m_bPinned) {
+                w->m_iWorkspaceID = nextWorkspaceOnMonitorID;
+                continue;
+            }
+
             w->m_iMonitorID = pMonitor->ID;
 
             // additionally, move floating and fs windows manually