fixed bug 193442. Thanks for the great test case.

BUG: 193442

svn path=/trunk/KDE/kdebase/workspace/; revision=972300
This commit is contained in:
Michael Zanetti 2009-05-24 14:26:00 +00:00
parent 5ebb6eec4d
commit 4dee88ba65

View file

@ -193,7 +193,7 @@ void SlideBackEffect::prePaintWindow( EffectWindow *w, WindowPrePaintData &data,
void SlideBackEffect::paintWindow( EffectWindow *w, int mask, QRegion region, WindowPaintData &data ) void SlideBackEffect::paintWindow( EffectWindow *w, int mask, QRegion region, WindowPaintData &data )
{ {
if( stackingOrderChanged() && ( w == newTopWindow() ) ) if( stackingOrderChanged() && ( w == newTopWindow() ) && !disabled )
{ {
/* This can happen because of two reasons: /* This can happen because of two reasons:
- a window has received the focus earlier without beeing raised and is raised now. -> call windowActivated() now - a window has received the focus earlier without beeing raised and is raised now. -> call windowActivated() now
@ -209,11 +209,8 @@ void SlideBackEffect::paintWindow( EffectWindow *w, int mask, QRegion region, Wi
} }
} }
// Finally call windowActivated in case a already active window is raised. // Finally call windowActivated in case a already active window is raised.
if( !disabled )
{
windowActivated( w ); windowActivated( w );
} }
}
if( motionManager.isManaging( w ) ) if( motionManager.isManaging( w ) )
{ {
motionManager.apply( w, data ); motionManager.apply( w, data );