equal
deleted
inserted
replaced
334 animation->stop(); |
334 animation->stop(); |
335 } |
335 } |
336 animation->disconnect(this); |
336 animation->disconnect(this); |
337 animation->setEndValue(pageLayerXPos(targetPageIndex)); |
337 animation->setEndValue(pageLayerXPos(targetPageIndex)); |
338 animation->setDuration(duration); |
338 animation->setDuration(duration); |
|
339 |
|
340 if (abs(mDeltaX) < HSCONFIGURATION_GET(pageChangePanDistanceInPixels)) { |
|
341 animation->setEasingCurve(HSCONFIGURATION_GET(bounceAnimationEasingCurve)); |
|
342 } |
|
343 else { |
|
344 animation->setEasingCurve(HSCONFIGURATION_GET(pageChangeAnimationEasingCurve)); |
|
345 } |
|
346 |
339 connect(animation, |
347 connect(animation, |
340 SIGNAL(finished()), |
348 SIGNAL(finished()), |
341 SLOT(pageChangeAnimationFinished()), |
349 SLOT(pageChangeAnimationFinished()), |
342 Qt::UniqueConnection); |
350 Qt::UniqueConnection); |
343 animation->start(); |
351 animation->start(); |