From 20605ddca1479ec8823023bbc2ab4a4e0818a477 Mon Sep 17 00:00:00 2001 From: Lucas Murray Date: Tue, 18 Nov 2008 13:36:34 +0000 Subject: [PATCH] Mark the slide plugin as being a fullscreen effect. CCBUG: 167928 svn path=/trunk/KDE/kdebase/workspace/; revision=886018 --- effects/slide.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/effects/slide.cpp b/effects/slide.cpp index e06fc0d7e2..d5ab5cda1b 100644 --- a/effects/slide.cpp +++ b/effects/slide.cpp @@ -54,6 +54,7 @@ void SlideEffect::prePaintScreen( ScreenPrePaintData& data, int time ) { slide = false; mTimeLine.setProgress(0); + effects->setActiveFullScreenEffect( NULL ); } } effects->prePaintScreen( data, time ); @@ -256,13 +257,17 @@ void SlideEffect::desktopChanged( int old ) { // at the end, stop slide = false; mTimeLine.setProgress(0); + effects->setActiveFullScreenEffect( NULL ); } } else { + if( effects->activeFullScreenEffect() && effects->activeFullScreenEffect() != this ) + return; mTimeLine.setProgress(0); slide_start_pos = desktopRect( old, false ).topLeft(); slide = true; + effects->setActiveFullScreenEffect( this ); } effects->addRepaintFull(); }