don't use un/minimization while in fullscreen effect

BUG: 261768 svn path=/trunk/KDE/kdebase/workspace/; revision=1210684
15 years ago · 5c3c4b0e24
parent f6600709de
commit 5c3c4b0e24
2 changed files with 8 additions and 0 deletions
--- a/effects/magiclamp/magiclamp.cpp
+++ b/effects/magiclamp/magiclamp.cpp
@ -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);
--- a/effects/minimizeanimation/minimizeanimation.cpp
+++ b/effects/minimizeanimation/minimizeanimation.cpp
@ -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 ));