yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reverted 969982

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=970056
This commit is contained in:
Michael Zanetti 2009-05-19 13:52:50 +00:00
parent e10bd8cc11
commit ff53c951d7
1 changed files with 27 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
effects/slideback/slideback.cpp
View file

@ -182,26 +182,6 @@ void SlideBackEffect::postPaintScreen()
void SlideBackEffect::prePaintWindow( EffectWindow *w, WindowPrePaintData &data, int time )
{
if( stackingOrderChanged() && ( w == newTopWindow() ) )
{
/* This can happen because of two reasons:
- a window has received the focus earlier without beeing raised and is raised now. -> call windowActivated() now
- paintWindow() is called with a new stackingOrder before activateWindow(). Bug? -> don't draw the overlapping content;*/
foreach( EffectWindow *tmp, oldStackingOrder )
{
if( oldStackingOrder.lastIndexOf( tmp ) > oldStackingOrder.lastIndexOf( w ) && isWindowUsable( tmp ) )
{
// kDebug() << "screw detected." << "clip:" << data.paint << " clipping:" << tmp->geometry() ;
PaintClipper::push( data.paint.subtracted( tmp->geometry() ) );
clippedRegions.prepend( data.paint.subtracted( tmp->geometry() ) );
}
}
// Finally call windowActivated in case a already active window is raised.
if( !disabled )
{
windowActivated( w );
}
}
if( motionManager.isManaging( w ) )
{
data.setTransformed();
@ -212,15 +192,34 @@ void SlideBackEffect::prePaintWindow( EffectWindow *w, WindowPrePaintData &data,
void SlideBackEffect::paintWindow( EffectWindow *w, int mask, QRegion region, WindowPaintData &data )
{
if( stackingOrderChanged() && ( w == newTopWindow() ) )
{
/* This can happen because of two reasons:
- a window has received the focus earlier without beeing raised and is raised now. -> call windowActivated() now
- paintWindow() is called with a new stackingOrder before activateWindow(). Bug? -> don't draw the overlapping content;*/
foreach( EffectWindow *tmp, oldStackingOrder )
{
if( oldStackingOrder.lastIndexOf( tmp ) > oldStackingOrder.lastIndexOf( w ) && isWindowUsable( tmp ) )
{
kDebug() << "screw detected. region:" << region << "clipping:" << tmp->geometry() ;
PaintClipper::push( region.subtracted( tmp->geometry() ) );
clippedRegions.prepend( region.subtracted( tmp->geometry() ) );
// region = region.subtracted( tmp->geometry() );
}
}
// Add a full repaint to make sure the not painted area is repainted soon
effects->addRepaintFull();
// Finally call windowActivated in case a already active window is raised.
if( !disabled )
{
windowActivated( w );
}
}
if( motionManager.isManaging( w ) )
{
motionManager.apply( w, data );
}
effects->paintWindow( w, mask, region, data );
}
void SlideBackEffect::postPaintWindow( EffectWindow* w )
{
if( !clippedRegions.isEmpty() )
{
foreach( const QRegion &region, clippedRegions )
@ -229,6 +228,10 @@ void SlideBackEffect::postPaintWindow( EffectWindow* w )
}
clippedRegions.clear();
}
}
void SlideBackEffect::postPaintWindow( EffectWindow* w )
{
if( motionManager.isManaging( w ) )
{
if( destinationList.contains( w ) )