diff --git a/animator.cpp b/animator.cpp index e45ab2d42..de148e596 100644 --- a/animator.cpp +++ b/animator.cpp @@ -59,7 +59,7 @@ int Animator::animationDuration(Plasma::Phase::Animation) const return 200; } -int Animator::duration(Plasma::Phase::Movement movement) const +int Animator::movementAnimationDuration(Plasma::Phase::Movement movement) const { switch (movement) { case Phase::FastSlideIn: diff --git a/animator.h b/animator.h index b83ed17c5..931ffe30a 100644 --- a/animator.h +++ b/animator.h @@ -48,7 +48,7 @@ public: virtual int movementAnimationFramesPerSecond(Plasma::Phase::Movement) const; virtual int elementAnimationFramesPerSecond(Plasma::Phase::ElementAnimation) const; virtual int animationDuration(Plasma::Phase::Animation) const; - virtual int duration(Plasma::Phase::Movement) const; + virtual int movementAnimationDuration(Plasma::Phase::Movement) const; virtual int duration(Plasma::Phase::ElementAnimation) const; virtual Phase::CurveShape curve(Plasma::Phase::Animation) const; virtual Phase::CurveShape curve(Plasma::Phase::Movement) const; diff --git a/phase.cpp b/phase.cpp index 6b93ed29b..da5ffe859 100644 --- a/phase.cpp +++ b/phase.cpp @@ -323,7 +323,7 @@ void Phase::moveItem(QGraphicsItem* item, Movement movement, const QPoint &desti //TODO: variance in times based on the value of animation state->frames = frames / 2; state->currentFrame = 0; - state->interval = d->animator->duration(movement) / state->frames; + state->interval = d->animator->movementAnimationDuration(movement) / state->frames; state->interval = (state->interval / MIN_TICK_RATE) * MIN_TICK_RATE; state->currentInterval = state->interval; state->qobj = dynamic_cast(item);