8fc0f86 · unity8 · git.iko.soy

on xenial help sign in

fix easingcurve, adjust animation speed

8fc0f86Michael Zanetti12 years ago

plugins/Utils/easingcurve.cpp+6−1

@@ -18,6 +18,7 @@

19#include "easingcurve.h"

21+#include <QDebug>

22EasingCurve::EasingCurve(QObject *parent):

23EasingCurve::EasingCurve(QObject *parent):

23 QObject(parent)

24 QObject(parent)

@@ -32,7 +33,11 @@ QEasingCurve::Type EasingCurve::type() const

33void EasingCurve::setType(const QEasingCurve::Type &type)

34void EasingCurve::setType(const QEasingCurve::Type &type)

34{

35{

36+ // FIXME: Working around bug https://bugreports.qt-project.org/browse/QTBUG-38686 here

37+ QEasingCurve newCurve;

35− m_easingCurve.setType(type);

38+ newCurve.setType(type);

39+ newCurve.setPeriod(m_easingCurve.period());

40+ m_easingCurve = newCurve;

36 Q_EMIT typeChanged();

41 Q_EMIT typeChanged();

37}

42}

qml/Stages/TabletStage.qml+2−2

@@ -291,8 +291,8 @@ Item {

291 target: spreadView

292 property: "contentX"

293 to: snapAnimation.targetContentX

294− duration: UbuntuAnimation.SlowDuration

294+// duration: UbuntuAnimation.SlowDuration

295−// duration: UbuntuAnimation.FastDuration

295+ duration: UbuntuAnimation.FastDuration

296 }

297

298 ScriptAction {