From 9766a9421632ca48cfdc694164e12a85ac5a2e05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <kde@martin-graesslin.com>
Date: Sat, 23 May 2009 11:51:38 +0000
Subject: [PATCH] Adjust animation time in cube switch: the complete animation
 has a fixed time, not the single steps. That fixes a regression compared to
 4.2.

svn path=/trunk/KDE/kdebase/workspace/; revision=971743
---
 effects/cube/cubeslide.cpp | 5 +++--
 effects/cube/cubeslide.h   | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/effects/cube/cubeslide.cpp b/effects/cube/cubeslide.cpp
index ce8b629053..e17bd8988b 100644
--- a/effects/cube/cubeslide.cpp
+++ b/effects/cube/cubeslide.cpp
@@ -50,9 +50,9 @@ bool CubeSlideEffect::supported()
 void CubeSlideEffect::reconfigure( ReconfigureFlags )
     {
     KConfigGroup conf = effects->effectConfig( "CubeSlide" );
-    int rotationDuration = animationTime( conf, "RotationDuration", 500 );
+    rotationDuration = conf.readEntry( "RotationDuration", 500 );
     timeLine.setCurveShape( TimeLine::EaseInOutCurve );
-    timeLine.setDuration( rotationDuration );
+    timeLine.setDuration( animationTime( rotationDuration ) );
     dontSlidePanels = conf.readEntry( "DontSlidePanels", true );
     dontSlideStickyWindows = conf.readEntry( "DontSlideStickyWindows", false );
     usePagerLayout = conf.readEntry( "UsePagerLayout", true );
@@ -566,6 +566,7 @@ void CubeSlideEffect::desktopChanged( int old )
                 }
             }
         }
+    timeLine.setDuration( animationTime( (float)rotationDuration / (float)slideRotations.count() ) );
     if( activate )
         {
         if( slideRotations.count() == 1 )
diff --git a/effects/cube/cubeslide.h b/effects/cube/cubeslide.h
index 348d0c1e54..d28647544a 100644
--- a/effects/cube/cubeslide.h
+++ b/effects/cube/cubeslide.h
@@ -64,6 +64,7 @@ class CubeSlideEffect
         bool dontSlidePanels;
         bool dontSlideStickyWindows;
         bool usePagerLayout;
+        int rotationDuration;
     };
 }