From 59590e2ff57a191279826805be9c48884f807a73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Thu, 28 May 2009 11:37:02 +0000 Subject: [PATCH] Move pushRenderTarget() in logout effect into paintScreen(). That ensures that logout effect doesn't pop the render target of another effect. BUG: 194230 svn path=/trunk/KDE/kdebase/workspace/; revision=973990 --- effects/logout/logout.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/effects/logout/logout.cpp b/effects/logout/logout.cpp index d201665b58..3d8b55b13d 100644 --- a/effects/logout/logout.cpp +++ b/effects/logout/logout.cpp @@ -92,7 +92,6 @@ void LogoutEffect::prePaintScreen( ScreenPrePaintData& data, int time ) if( blurSupported && progress > 0.0 ) { data.mask |= PAINT_SCREEN_WITH_TRANSFORMED_WINDOWS; - effects->pushRenderTarget( blurTarget ); } #endif @@ -142,6 +141,12 @@ void LogoutEffect::paintWindow( EffectWindow* w, int mask, QRegion region, Windo void LogoutEffect::paintScreen( int mask, QRegion region, ScreenPaintData& data ) { +#ifdef KWIN_HAVE_OPENGL_COMPOSITING + if( blurSupported && progress > 0.0 ) + { + effects->pushRenderTarget( blurTarget ); + } +#endif effects->paintScreen( mask, region, data ); #ifdef KWIN_HAVE_OPENGL_COMPOSITING