diff --git a/animator.cpp b/animator.cpp index 8c7707d32..a33211136 100644 --- a/animator.cpp +++ b/animator.cpp @@ -78,7 +78,7 @@ int Animator::elementAnimationDuration(Plasma::Phase::ElementAnimation) const return 333; } -Phase::CurveShape Animator::curve(Plasma::Phase::Animation) const +Phase::CurveShape Animator::animationCurve(Plasma::Phase::Animation) const { return Phase::EaseInOutCurve; } diff --git a/animator.h b/animator.h index e0b526a89..9933bab5a 100644 --- a/animator.h +++ b/animator.h @@ -50,7 +50,7 @@ public: virtual int animationDuration(Plasma::Phase::Animation) const; virtual int movementAnimationDuration(Plasma::Phase::Movement) const; virtual int elementAnimationDuration(Plasma::Phase::ElementAnimation) const; - virtual Phase::CurveShape curve(Plasma::Phase::Animation) const; + virtual Phase::CurveShape animationCurve(Plasma::Phase::Animation) const; virtual Phase::CurveShape curve(Plasma::Phase::Movement) const; virtual Phase::CurveShape curve(Plasma::Phase::ElementAnimation) const; diff --git a/phase.cpp b/phase.cpp index 92aaa1031..717bf153a 100644 --- a/phase.cpp +++ b/phase.cpp @@ -274,7 +274,7 @@ void Phase::animateItem(QGraphicsItem* item, Animation animation) AnimationState* state = new AnimationState; state->item = item; state->animation = animation; - state->curve = d->animator->curve(animation); + state->curve = d->animator->animationCurve(animation); //TODO: variance in times based on the value of animation state->frames = frames / 3; state->currentFrame = 0;