animationFramesPerSecond(element) -> elementAnimationFramesPerSecond(element)
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=800735
This commit is contained in:
parent
27954bc347
commit
eb378c78fd
@ -48,7 +48,7 @@ int Animator::movementAnimationFramesPerSecond(Plasma::Phase::Movement movement)
|
|||||||
return 20;
|
return 20;
|
||||||
}
|
}
|
||||||
|
|
||||||
int Animator::animationFramesPerSecond(Plasma::Phase::ElementAnimation animation) const
|
int Animator::elementAnimationFramesPerSecond(Plasma::Phase::ElementAnimation animation) const
|
||||||
{
|
{
|
||||||
Q_UNUSED(animation)
|
Q_UNUSED(animation)
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -46,7 +46,7 @@ public:
|
|||||||
// Parameter definitions
|
// Parameter definitions
|
||||||
virtual int animationFramesPerSecond(Plasma::Phase::Animation) const;
|
virtual int animationFramesPerSecond(Plasma::Phase::Animation) const;
|
||||||
virtual int movementAnimationFramesPerSecond(Plasma::Phase::Movement) const;
|
virtual int movementAnimationFramesPerSecond(Plasma::Phase::Movement) const;
|
||||||
virtual int animationFramesPerSecond(Plasma::Phase::ElementAnimation) const;
|
virtual int elementAnimationFramesPerSecond(Plasma::Phase::ElementAnimation) const;
|
||||||
virtual int animationDuration(Plasma::Phase::Animation) const;
|
virtual int animationDuration(Plasma::Phase::Animation) const;
|
||||||
virtual int duration(Plasma::Phase::Movement) const;
|
virtual int duration(Plasma::Phase::Movement) const;
|
||||||
virtual int duration(Plasma::Phase::ElementAnimation) const;
|
virtual int duration(Plasma::Phase::ElementAnimation) const;
|
||||||
|
@ -397,7 +397,7 @@ Phase::AnimId Phase::animateElement(QGraphicsItem *item, ElementAnimation animat
|
|||||||
state->curve = d->animator->curve(animation);
|
state->curve = d->animator->curve(animation);
|
||||||
state->animation = animation;
|
state->animation = animation;
|
||||||
//TODO: variance in times based on the value of animation
|
//TODO: variance in times based on the value of animation
|
||||||
state->frames = d->animator->animationFramesPerSecond(animation) / 5;
|
state->frames = d->animator->elementAnimationFramesPerSecond(animation) / 5;
|
||||||
state->currentFrame = 0;
|
state->currentFrame = 0;
|
||||||
state->interval = d->animator->duration(animation) / state->frames;
|
state->interval = d->animator->duration(animation) / state->frames;
|
||||||
state->interval = (state->interval / MIN_TICK_RATE) * MIN_TICK_RATE;
|
state->interval = (state->interval / MIN_TICK_RATE) * MIN_TICK_RATE;
|
||||||
|
Loading…
Reference in New Issue
Block a user