Following the same function convention call in the remaining classes.
TODO: check which classes it makes sense to actually allow the user to set the easing curve. svn path=/trunk/KDE/kdelibs/; revision=1060689
This commit is contained in:
parent
5a721b9bad
commit
ca35755ac0
@ -78,8 +78,8 @@ void GeometryAnimation::updateCurrentTime(int currentTime)
|
||||
{
|
||||
QGraphicsWidget *w = widgetToAnimate();
|
||||
if (w) {
|
||||
qreal delta = easingCurve().valueForProgress(
|
||||
currentTime / qreal(duration()));
|
||||
qreal delta = Animation::easingCurve().valueForProgress(
|
||||
currentTime / qreal(duration()));
|
||||
|
||||
QRectF newGeo = m_startGeometry;
|
||||
newGeo.adjust((-m_startGeometry.x() + m_targetGeometry.x()) * delta,
|
||||
|
@ -98,8 +98,8 @@ void PulseAnimation::updateCurrentTime(int currentTime)
|
||||
{
|
||||
QGraphicsWidget *w = under;
|
||||
if (w) {
|
||||
qreal delta = easingCurve().valueForProgress(
|
||||
currentTime / qreal(duration()));
|
||||
qreal delta = Animation::easingCurve().valueForProgress(
|
||||
currentTime / qreal(duration()));
|
||||
delta = (1 - endScale) * delta;
|
||||
w->setScale(1 - delta);
|
||||
}
|
||||
|
@ -162,8 +162,8 @@ void RotationAnimation::updateCurrentTime(int currentTime)
|
||||
{
|
||||
QGraphicsWidget *w = widgetToAnimate();
|
||||
if (w) {
|
||||
qreal delta = easingCurve().valueForProgress(
|
||||
currentTime / qreal(duration()));
|
||||
qreal delta = Animation::easingCurve().valueForProgress(
|
||||
currentTime / qreal(duration()));
|
||||
delta = angle() * delta;
|
||||
m_rotation->setAngle(delta);
|
||||
}
|
||||
|
@ -150,13 +150,13 @@ void RotationStackedAnimation::updateCurrentTime(int currentTime)
|
||||
if(w) {
|
||||
qreal delta;
|
||||
if (currentTime <= duration()/2) {
|
||||
delta = easingCurve().valueForProgress(
|
||||
delta = Animation::easingCurve().valueForProgress(
|
||||
(currentTime * 2) / qreal(duration()));
|
||||
sLayout->setCurrentWidgetIndex(0);
|
||||
delta = frontEndAngle * delta;
|
||||
frontRotation->setAngle(delta);
|
||||
} else {
|
||||
delta = easingCurve().valueForProgress(
|
||||
delta = Animation::easingCurve().valueForProgress(
|
||||
(currentTime/2) / qreal(duration()));
|
||||
sLayout->setCurrentWidgetIndex(1);
|
||||
delta = backEndAngle * delta;
|
||||
|
@ -64,8 +64,8 @@ void ZoomAnimation::updateCurrentTime(int currentTime)
|
||||
{
|
||||
QGraphicsWidget *w = widgetToAnimate();
|
||||
if (w) {
|
||||
qreal delta = easingCurve().valueForProgress(
|
||||
currentTime / qreal(duration()));
|
||||
qreal delta = Animation::easingCurve().valueForProgress(
|
||||
currentTime / qreal(duration()));
|
||||
delta = (1 - m_zoom) * delta;
|
||||
w->setScale( 1 - delta);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user