Boxswitch uses paintWindow instead of drawWindow to paint the thumbnail and invert uses drawWindow instead of paintWindow to set the shader.
That way the thumbnail is passed through the whole rendering pass and has the same invert state as the window. BUG: 212348 svn path=/trunk/KDE/kdebase/workspace/; revision=1059463
This commit is contained in:
parent
165e2edb08
commit
612972eea0
3 changed files with 5 additions and 5 deletions
|
@ -841,7 +841,7 @@ void BoxSwitchEffect::paintWindowThumbnail( EffectWindow* w )
|
|||
}
|
||||
|
||||
// paint one part of the thumbnail
|
||||
effects->drawWindow( w,
|
||||
effects->paintWindow( w,
|
||||
PAINT_WINDOW_OPAQUE | PAINT_WINDOW_TRANSFORMED,
|
||||
windows[ w ]->thumbnail, data );
|
||||
|
||||
|
@ -890,7 +890,7 @@ void BoxSwitchEffect::paintWindowThumbnail( EffectWindow* w )
|
|||
windows[ w ]->thumbnail, w,
|
||||
secondThumbnail.adjusted( highlight_margin, highlight_margin, -highlight_margin, -highlight_margin ),
|
||||
Qt::KeepAspectRatio );
|
||||
effects->drawWindow( w,
|
||||
effects->paintWindow( w,
|
||||
PAINT_WINDOW_OPAQUE | PAINT_WINDOW_TRANSFORMED,
|
||||
windows[ w ]->thumbnail, data );
|
||||
}
|
||||
|
|
|
@ -87,7 +87,7 @@ bool InvertEffect::loadData()
|
|||
return true;
|
||||
}
|
||||
|
||||
void InvertEffect::paintWindow( EffectWindow* w, int mask, QRegion region, WindowPaintData& data )
|
||||
void InvertEffect::drawWindow( EffectWindow* w, int mask, QRegion region, WindowPaintData& data )
|
||||
{
|
||||
// Load if we haven't already
|
||||
if( m_valid && !m_inited )
|
||||
|
@ -112,7 +112,7 @@ void InvertEffect::paintWindow( EffectWindow* w, int mask, QRegion region, Windo
|
|||
data.shader = m_shader;
|
||||
}
|
||||
|
||||
effects->paintWindow( w, mask, region, data );
|
||||
effects->drawWindow( w, mask, region, data );
|
||||
|
||||
if( useShader )
|
||||
m_shader->unbind();
|
||||
|
|
|
@ -40,7 +40,7 @@ class InvertEffect
|
|||
InvertEffect();
|
||||
~InvertEffect();
|
||||
|
||||
virtual void paintWindow( EffectWindow* w, int mask, QRegion region, WindowPaintData& data );
|
||||
virtual void drawWindow( EffectWindow* w, int mask, QRegion region, WindowPaintData& data );
|
||||
virtual void windowClosed( EffectWindow* w );
|
||||
|
||||
public slots:
|
||||
|
|
Loading…
Reference in a new issue