@@ -1046,9 +1046,10 @@ void TimeLine::setCurveShape(CurveShape curveShape) ***************************************************************/ WindowMotionManager::WindowMotionManager( bool useGlobalAnimationModifier ) - : m_movingWindows( 0 ) + : m_useGlobalAnimationModifier( useGlobalAnimationModifier ) + , m_movingWindows( 0 ) { // TODO: Allow developer to modify motion attributes - } // TODO: useGlobalAnimationModifier + } WindowMotionManager::~WindowMotionManager() { @@ -1056,11 +1057,21 @@ WindowMotionManager::~WindowMotionManager() void WindowMotionManager::manage( EffectWindow *w ) { - // TODO: Apply global animation modifier if( m_managedWindows.contains( w )) return; + + double strength = 7.5; + double decay = 0.5; + if( m_useGlobalAnimationModifier ) + { + if( effects->animationTimeFactor() ) // If == 0 we just skip the calculation + strength = 7.5 * 1.0 / effects->animationTimeFactor(); + decay = effects->animationTimeFactor() / ( effects->animationTimeFactor() + 1.0 ); + } + m_managedWindows[ w ] = WindowMotion(); - m_managedWindows[ w ].scale.setDecay( 0.25 ); + m_managedWindows[ w ].translation.setStrengthDecay( strength, decay ); + m_managedWindows[ w ].scale.setStrengthDecay( strength, decay / 2.0 ); m_managedWindows[ w ].translation.setValue( w->pos() ); m_managedWindows[ w ].scale.setValue( QPointF( 1.0, 1.0 )); @@ -1087,6 +1098,18 @@ void WindowMotionManager::unmanageAll() void WindowMotionManager::calculate( int time ) { + if( !effects->animationTimeFactor() ) + { // Just skip it completely if the user wants no animation + m_movingWindows = 0; + QHash<EffectWindow*, WindowMotion>::iterator it = m_managedWindows.begin(); + for(; it != m_managedWindows.end(); it++ ) + { + WindowMotion *motion = &it.value(); + motion->translation.finish(); + motion->scale.finish(); + } + } + QHash<EffectWindow*, WindowMotion>::iterator it = m_managedWindows.begin(); for(; it != m_managedWindows.end(); it++ ) { @@ -1094,6 +1117,7 @@ void WindowMotionManager::calculate( int time ) bool stopped = false; // TODO: What happens when distance() == 0 but we are still moving fast? + // TODO: Motion needs to be calculated from the window's center QPointF diffT = motion->translation.distance(); if( diffT != QPoint( 0.0, 0.0 )) lib/kwineffects.cpp @@ -1261,6 +1261,7 @@ class KWIN_EXPORT WindowMotionManager inline bool areWindowsMoving() { return m_movingWindows > 0; } private: + bool m_useGlobalAnimationModifier; struct WindowMotion { // TODO: Rotation, etc? Motion<QPointF> translation; // Absolute position lib/kwineffects.h 6cb77a6de5e0e7f45781ee91bee7345b28426e67 Lucas Murray lmurray@undefinedfire.com http://github.com/Zarin/kwin/commit/5ece56d33280575edbf77cec41cfa34c72e15a85 5ece56d33280575edbf77cec41cfa34c72e15a85 2008-09-22T04:45:12-07:00 2008-09-22T04:45:12-07:00 Use the global animation modifier. 9cc291fd6d58f0e2ffe10974957d456afe6c9d89 Lucas Murray lmurray@undefinedfire.com