From 612972eea02102c38db92b6ca6f86116dc6e6bfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <kde@martin-graesslin.com>
Date: Sun, 6 Dec 2009 17:25:35 +0000
Subject: [PATCH] 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
---
 effects/boxswitch/boxswitch.cpp | 4 ++--
 effects/invert/invert.cpp       | 4 ++--
 effects/invert/invert.h         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/effects/boxswitch/boxswitch.cpp b/effects/boxswitch/boxswitch.cpp
index e06db456e3..25aaf88598 100644
--- a/effects/boxswitch/boxswitch.cpp
+++ b/effects/boxswitch/boxswitch.cpp
@@ -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 );
         }
diff --git a/effects/invert/invert.cpp b/effects/invert/invert.cpp
index c8aa4828e0..7a8815b8ab 100644
--- a/effects/invert/invert.cpp
+++ b/effects/invert/invert.cpp
@@ -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();
diff --git a/effects/invert/invert.h b/effects/invert/invert.h
index 3d89540215..2ce9b4302b 100644
--- a/effects/invert/invert.h
+++ b/effects/invert/invert.h
@@ -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: