Commit 92866c98 authored by Kishore Gopalakrishnan's avatar Kishore Gopalakrishnan Committed by Vlad Zahorodnii
Browse files

Swapping desktops: only swap windows on current activity.

In the desktop grid effect, dragging an empty area of a desktop to
another desktop swaps all windows on the two desktops. This change makes
sure that this matches only windows in the current activity.

Was earlier fixed in
plasma/kwin@1e0b0c88
, but the bug was reintroduced by the QML rewrite.

BUG: 386769


(cherry picked from commit ed128064)
parent f32e1731
Pipeline #205289 passed with stage
in 17 minutes and 36 seconds
......@@ -199,7 +199,7 @@ void DesktopGridEffect::swapDesktops(int from, int to)
QList<EffectWindow *> fromList;
QList<EffectWindow *> toList;
for (auto *w : effects->stackingOrder()) {
if (!w->isNormalWindow()) {
if (!w->isNormalWindow() || !w->isOnCurrentActivity() ) {
continue;
}
if (w->isOnDesktop(from)) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment