on xenial help sign in
fix easingcurve, adjust animation speed
commit8fc0f86a632596fa40a750c35ad286fae4648e78 authorMichael Zanetti <michael.zanetti@canonical.com> dateWed 4 Jun 2014, 14:01 (12 years ago) parent2628b44
2 files changed+8−3
plugins/Utils/easingcurve.cpp+6−1 qml/Stages/TabletStage.qml+2−2
plugins/Utils/easingcurve.cpp+6−1
@@ -18,6 +18,7 @@
1818
1919#include "easingcurve.h"
2020
21+#include <QDebug>
2122
2223EasingCurve::EasingCurve(QObject *parent):
2324 QObject(parent)
@@ -32,7 +33,11 @@ QEasingCurve::Type EasingCurve::type() const
3233
3334void EasingCurve::setType(const QEasingCurve::Type &type)
3435{
35− m_easingCurve.setType(type);
36+ // FIXME: Working around bug https://bugreports.qt-project.org/browse/QTBUG-38686 here
37+ QEasingCurve newCurve;
38+ newCurve.setType(type);
39+ newCurve.setPeriod(m_easingCurve.period());
40+ m_easingCurve = newCurve;
3641 Q_EMIT typeChanged();
3742}
3843
qml/Stages/TabletStage.qml+2−2
@@ -291,8 +291,8 @@ Item {
291291 target: spreadView
292292 property: "contentX"
293293 to: snapAnimation.targetContentX
294− duration: UbuntuAnimation.SlowDuration
295−// duration: UbuntuAnimation.FastDuration
294+// duration: UbuntuAnimation.SlowDuration
295+ duration: UbuntuAnimation.FastDuration
296296 }
297297
298298 ScriptAction {