From 122a97b9c8286345b4e78e761d133763cce8dfe2 Mon Sep 17 00:00:00 2001
From: Jan Gerrit Marker <jangerrit@weiler-marker.com>
Date: Sun, 24 Apr 2011 17:44:54 +0200
Subject: [PATCH] Desktop grid effect now does not preserve space for windows
 from other activities. BUG:242555

---
 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 723b146d55..950303f8c2 100644
--- a/effects/desktopgrid/desktopgrid.cpp
+++ b/effects/desktopgrid/desktopgrid.cpp
@@ -1096,7 +1096,7 @@ void DesktopGridEffect::setup()
                 WindowMotionManager manager;
                 foreach (EffectWindow * w, effects->stackingOrder()) {
                     if (w->isOnDesktop(i) && w->screen() == j && !w->isDesktop() && !w->isDock() &&
-                            w->visibleInClientGroup() && !w->isSkipSwitcher()) {
+                            w->visibleInClientGroup() && !w->isSkipSwitcher() && w->isOnCurrentActivity()) {
                         manager.manage(w);
                     }
                 }