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

Fix #245372 (clipping error on VD change)

Browse source 
BUG: 245372

svn path=/trunk/KDE/kdebase/workspace/; revision=1197040
This commit is contained in:
Thomas Lübking 2010-11-14 18:03:36 +00:00
parent af7c8e347f
commit 7d7cac1924
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
effects/slideback/slideback.cpp
View file

@ -34,6 +34,11 @@ SlideBackEffect::SlideBackEffect()
disabled = false; disabled = false;
unminimizedWindow = NULL; unminimizedWindow = NULL;
} }
static inline bool windowsShareDesktop( EffectWindow *w1, EffectWindow *w2 )
{
return w1->isOnAllDesktops() || w2->isOnAllDesktops() || w1->desktop() == w2->desktop();
}
void SlideBackEffect::windowActivated( EffectWindow* w ) void SlideBackEffect::windowActivated( EffectWindow* w )
{ {
@ -86,7 +91,7 @@ void SlideBackEffect::windowActivated( EffectWindow* w )
} }
else else
{ {
if( isWindowUsable( tmp ) && ( tmp->isOnDesktop( w->desktop() ) || w->isOnAllDesktops() ) ) if( isWindowUsable( tmp ) && windowsShareDesktop( tmp, w ) )
{ {
// Do we have to move it? // Do we have to move it?
if( intersects( w, tmp->geometry() ) ) if( intersects( w, tmp->geometry() ) )
@ -209,11 +214,11 @@ void SlideBackEffect::paintWindow( EffectWindow *w, int mask, QRegion region, Wi
- paintWindow() is called with a new stackingOrder before activateWindow(). Bug? -> don't draw the overlapping content;*/ - paintWindow() is called with a new stackingOrder before activateWindow(). Bug? -> don't draw the overlapping content;*/
foreach( EffectWindow *tmp, oldStackingOrder ) foreach( EffectWindow *tmp, oldStackingOrder )
{ {
if( oldStackingOrder.lastIndexOf( tmp ) > oldStackingOrder.lastIndexOf( w ) && isWindowUsable( tmp ) ) if( oldStackingOrder.lastIndexOf( tmp ) > oldStackingOrder.lastIndexOf( w ) && isWindowUsable( tmp ) && windowsShareDesktop( tmp, w ) )
{ {
kDebug() << "screw detected. region:" << region << "clipping:" << tmp->geometry() ; kDebug( 1212 ) << "screw detected. region:" << region << "clipping:" << tmp->geometry() ;
PaintClipper::push( region.subtracted( tmp->geometry() ) ); clippedRegions << region.subtracted( tmp->geometry() );
clippedRegions.prepend( region.subtracted( tmp->geometry() ) ); PaintClipper::push( clippedRegions.last() );
// region = region.subtracted( tmp->geometry() ); // region = region.subtracted( tmp->geometry() );
} }
} }
@ -225,14 +230,9 @@ void SlideBackEffect::paintWindow( EffectWindow *w, int mask, QRegion region, Wi
motionManager.apply( w, data ); motionManager.apply( w, data );
} }
effects->paintWindow( w, mask, region, data ); effects->paintWindow( w, mask, region, data );
if( !clippedRegions.isEmpty() ) for ( int i = clippedRegions.count() - 1; i > -1; --i )
{ PaintClipper::pop( clippedRegions.at(i) );
foreach( const QRegion &region, clippedRegions ) clippedRegions.clear();
{
PaintClipper::pop( region );
}
clippedRegions.clear();
}
} }
void SlideBackEffect::postPaintWindow( EffectWindow* w ) void SlideBackEffect::postPaintWindow( EffectWindow* w )