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
icc-effect-5.14.5
Martin Gräßlin 2010-11-27 07:07:19 +00:00
parent 7ff0c0aad6
commit 0fef632c03
1 changed files with 3 additions and 0 deletions

View File

@ -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;