backport of 1210684
don't use un/minimization while in fullscreen effect CCBUG: 261768 svn path=/branches/KDE/4.6/kdebase/workspace/; revision=1210686icc-effect-5.14.5
parent
0ed1d80e9a
commit
ac40c6c93a
|
@ -369,6 +369,8 @@ void MagicLampEffect::windowDeleted( EffectWindow* w )
|
|||
|
||||
void MagicLampEffect::windowMinimized( EffectWindow* w )
|
||||
{
|
||||
if ( effects->activeFullScreenEffect() )
|
||||
return;
|
||||
mTimeLineWindows[w].setCurveShape(TimeLine::LinearCurve);
|
||||
mTimeLineWindows[w].setDuration( mAnimationDuration );
|
||||
mTimeLineWindows[w].setProgress(0.0f);
|
||||
|
@ -376,6 +378,8 @@ void MagicLampEffect::windowMinimized( EffectWindow* w )
|
|||
|
||||
void MagicLampEffect::windowUnminimized( EffectWindow* w )
|
||||
{
|
||||
if ( effects->activeFullScreenEffect() )
|
||||
return;
|
||||
mTimeLineWindows[w].setCurveShape(TimeLine::LinearCurve);
|
||||
mTimeLineWindows[w].setDuration( mAnimationDuration );
|
||||
mTimeLineWindows[w].setProgress(1.0f);
|
||||
|
|
|
@ -121,6 +121,8 @@ void MinimizeAnimationEffect::windowDeleted( EffectWindow* w )
|
|||
|
||||
void MinimizeAnimationEffect::windowMinimized( EffectWindow* w )
|
||||
{
|
||||
if ( effects->activeFullScreenEffect() )
|
||||
return;
|
||||
TimeLine &timeline = mTimeLineWindows[w];
|
||||
timeline.setCurveShape(TimeLine::EaseInCurve);
|
||||
timeline.setDuration( animationTime( 250 ));
|
||||
|
@ -129,6 +131,8 @@ void MinimizeAnimationEffect::windowMinimized( EffectWindow* w )
|
|||
|
||||
void MinimizeAnimationEffect::windowUnminimized( EffectWindow* w )
|
||||
{
|
||||
if ( effects->activeFullScreenEffect() )
|
||||
return;
|
||||
TimeLine &timeline = mTimeLineWindows[w];
|
||||
timeline.setCurveShape(TimeLine::EaseOutCurve);
|
||||
timeline.setDuration( animationTime( 250 ));
|
||||
|
|
Loading…
Reference in New Issue