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

Consistently decide whether shadow will be painted for a window.

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=728484
This commit is contained in:
Luboš Luňák 2007-10-23 12:40:03 +00:00
parent d51fb87c10
commit 211bbc95ba
3 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
effects/shadow.cpp
View file

@ -40,16 +40,20 @@ QRect ShadowEffect::shadowRectangle(const QRect& windowRectangle) const
return windowRectangle.adjusted( shadowXOffset - shadowGrow, shadowYOffset - shadowGrow,
shadowXOffset + shadowGrow, shadowYOffset + shadowGrow);
}
void ShadowEffect::prePaintWindow( EffectWindow* w, WindowPrePaintData& data, int time )
{
data.mask |= PAINT_WINDOW_TRANSLUCENT;
data.paint |= QRegion( shadowRectangle( ( QRegion( w->geometry()) & data.paint ).boundingRect() ));
if( useShadow( w ))
{
data.mask |= PAINT_WINDOW_TRANSLUCENT;
data.paint |= QRegion( shadowRectangle( ( QRegion( w->geometry()) & data.paint ).boundingRect() ));
}
effects->prePaintWindow( w, data, time );
}
void ShadowEffect::paintWindow( EffectWindow* w, int mask, QRegion region, WindowPaintData& data )
{
if( !w->isDeleted() && !w->isDesktop() && !w->isDock() )
if( useShadow( w ))
drawShadow( w, mask, region, data );
effects->paintWindow( w, mask, region, data );
}
@ -61,10 +65,17 @@ void ShadowEffect::postPaintWindow( EffectWindow* w )
QRect ShadowEffect::transformWindowDamage( EffectWindow* w, const QRect& r )
{
if( !useShadow( w ))
return effects->transformWindowDamage( w, r );
QRect r2 = r | shadowRectangle( r );
return effects->transformWindowDamage( w, r2 );
}
bool ShadowEffect::useShadow( EffectWindow* w ) const
{
return !w->isDeleted() && !w->isDesktop() && !w->isDock();
}
void ShadowEffect::addQuadVertices(QVector<float>& verts, float x1, float y1, float x2, float y2) const
{
verts << x1 << y1;

1
effects/shadow.h
View file

@ -33,6 +33,7 @@ class ShadowEffect
void addQuadVertices(QVector<float>& verts, float x1, float y1, float x2, float y2) const;
// transforms window rect -> shadow rect
QRect shadowRectangle(const QRect& windowRectangle) const;
bool useShadow( EffectWindow* w ) const;
int shadowXOffset, shadowYOffset;
double shadowOpacity;

2
scene.cpp
View file

@ -227,6 +227,8 @@ void Scene::paintSimpleScreen( int orig_mask, QRegion region )
if( !w->isPaintingEnabled())
continue;
data.paint -= allclips; // make sure to avoid already clipped areas
// no painting outside visible screen (and no transformations)
data.paint &= QRect( 0, 0, displayWidth(), displayHeight());
if( data.paint.isEmpty()) // completely clipped
continue;
if( data.paint != region ) // prepaint added area to draw