fixed bug 193442. Thanks for the great test case.
BUG: 193442 svn path=/trunk/KDE/kdebase/workspace/; revision=972300
This commit is contained in:
parent
5ebb6eec4d
commit
4dee88ba65
1 changed files with 2 additions and 5 deletions
|
@ -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,10 +209,7 @@ 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 ) )
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue