From 0fef632c03baccc2d8ed59c103a5e7d7aecb0406 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <kde@martin-graesslin.com>
Date: Sat, 27 Nov 2010 07:07:19 +0000
Subject: [PATCH] Block fullscreen effects from inside dashboard effect.

Prevents that e.g. desktop grid can be activated while dashboard is active.
Thanks to Michael Gapczynski for this Google Code-In contribution.
See Review Request http://svn.reviewboard.kde.org/r/5980/
CCBUG: 159519
CCMAIL: GapczynskiM@gmail.com

svn path=/trunk/KDE/kdebase/workspace/; revision=1201205
---
 effects/dashboard/dashboard.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/effects/dashboard/dashboard.cpp b/effects/dashboard/dashboard.cpp
index 75661ee688..8ce38579b5 100644
--- a/effects/dashboard/dashboard.cpp
+++ b/effects/dashboard/dashboard.cpp
@@ -121,6 +121,7 @@ void DashboardEffect::postPaintScreen()
             retransformWindow = false;
             transformWindow = false;
             effects->addRepaintFull();
+            effects->setActiveFullScreenEffect( 0 );
             }
 
         if( activateAnimation )
@@ -137,6 +138,7 @@ void DashboardEffect::postPaintScreen()
                 {
                 deactivateAnimation = false;
                 transformWindow = false;
+                effects->setActiveFullScreenEffect( 0 );
                 }
 
             effects->addRepaintFull();
@@ -166,6 +168,7 @@ void DashboardEffect::windowActivated( EffectWindow *w )
     // apply effect on dashboard activation
     if( isDashboard( w ) )
         {
+        effects->setActiveFullScreenEffect( this );
         transformWindow = true;
         window = w;