From e918cb5d2d3de033635d0cd7463de25fd6312b24 Mon Sep 17 00:00:00 2001 From: Vlad Zagorodniy Date: Wed, 11 Jul 2018 15:40:28 +0300 Subject: [PATCH] [effects/desktopgrid] Don't change activities Summary: If the Desktop Grid effect doesn't use the Present Windows effect to layout windows, windowAt helper can return a window that doesn't belong to current activity because it doesn't check whether that window belongs to current activity. This change addresses that problem by adding corresponding check. BUG: 301447 FIXED-IN: 5.13.4 Test Plan: //Unchecked "Use Present Windows effect to layout the windows".// * Switched to activity #1 * Switched to virtual desktop #1 * Launched Konsole and maximized it(to increate hit area) * Switched to activity #2 * Switched to virtual desktop #2 * Launched Dolphin and maximized it * Activated the Desktop Grid effect, clicked on virtual desktop #1 (activity #2 is still active) * Switched to activity #1 * Activated the Desktop Grid effect, clicked on virtual desktop #2 (activity #1 is still active) Reviewers: #kwin, davidedmundson Reviewed By: #kwin, davidedmundson Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D14046 --- effects/desktopgrid/desktopgrid.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/effects/desktopgrid/desktopgrid.cpp b/effects/desktopgrid/desktopgrid.cpp index d27d1d60e0..a358249515 100644 --- a/effects/desktopgrid/desktopgrid.cpp +++ b/effects/desktopgrid/desktopgrid.cpp @@ -851,7 +851,7 @@ EffectWindow* DesktopGridEffect::windowAt(QPoint pos) const } } else { foreach (EffectWindow * w, windows) { - if (w->isOnDesktop(desktop) && !w->isMinimized() && w->geometry().contains(pos)) + if (w->isOnDesktop(desktop) && w->isOnCurrentActivity() && !w->isMinimized() && w->geometry().contains(pos)) return w; } }