Mark the slide plugin as being a fullscreen effect.
CCBUG: 167928 svn path=/trunk/KDE/kdebase/workspace/; revision=886018
This commit is contained in:
parent
8c09fbc62a
commit
20605ddca1
1 changed files with 5 additions and 0 deletions
|
@ -54,6 +54,7 @@ void SlideEffect::prePaintScreen( ScreenPrePaintData& data, int time )
|
||||||
{
|
{
|
||||||
slide = false;
|
slide = false;
|
||||||
mTimeLine.setProgress(0);
|
mTimeLine.setProgress(0);
|
||||||
|
effects->setActiveFullScreenEffect( NULL );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
effects->prePaintScreen( data, time );
|
effects->prePaintScreen( data, time );
|
||||||
|
@ -256,13 +257,17 @@ void SlideEffect::desktopChanged( int old )
|
||||||
{ // at the end, stop
|
{ // at the end, stop
|
||||||
slide = false;
|
slide = false;
|
||||||
mTimeLine.setProgress(0);
|
mTimeLine.setProgress(0);
|
||||||
|
effects->setActiveFullScreenEffect( NULL );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
if( effects->activeFullScreenEffect() && effects->activeFullScreenEffect() != this )
|
||||||
|
return;
|
||||||
mTimeLine.setProgress(0);
|
mTimeLine.setProgress(0);
|
||||||
slide_start_pos = desktopRect( old, false ).topLeft();
|
slide_start_pos = desktopRect( old, false ).topLeft();
|
||||||
slide = true;
|
slide = true;
|
||||||
|
effects->setActiveFullScreenEffect( this );
|
||||||
}
|
}
|
||||||
effects->addRepaintFull();
|
effects->addRepaintFull();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue