diff options
| -rw-r--r-- | qt-ui/profile/animationfunctions.cpp | 24 | ||||
| -rw-r--r-- | qt-ui/profile/animationfunctions.h | 4 | ||||
| -rw-r--r-- | qt-ui/profile/diveeventitem.cpp | 2 |
3 files changed, 19 insertions, 11 deletions
diff --git a/qt-ui/profile/animationfunctions.cpp b/qt-ui/profile/animationfunctions.cpp index 8cccf616e..608c4c000 100644 --- a/qt-ui/profile/animationfunctions.cpp +++ b/qt-ui/profile/animationfunctions.cpp @@ -1,6 +1,7 @@ #include "animationfunctions.h" #include <QPropertyAnimation> #include <QPointF> +#include <QSettings> namespace Animations { @@ -22,17 +23,24 @@ namespace Animations animation->start(QAbstractAnimation::DeleteWhenStopped); } - void moveTo(QObject *obj, qreal x, qreal y, int msecs) + void moveTo(QObject *obj, qreal x, qreal y) { - QPropertyAnimation *animation = new QPropertyAnimation(obj, "pos"); - animation->setDuration(msecs); - animation->setStartValue(obj->property("pos").toPointF()); - animation->setEndValue(QPointF(x, y)); - animation->start(QAbstractAnimation::DeleteWhenStopped); + QSettings s; + int msecs = s.value("animation_speed", 500).toInt(); + if (msecs != 0){ + QPropertyAnimation *animation = new QPropertyAnimation(obj, "pos"); + animation->setDuration(msecs); + animation->setStartValue(obj->property("pos").toPointF()); + animation->setEndValue(QPointF(x, y)); + animation->start(QAbstractAnimation::DeleteWhenStopped); + } + else{ + obj->setProperty("pos", QPointF(x,y)); + } } - void moveTo(QObject *obj, const QPointF &pos, int msecs) + void moveTo(QObject *obj, const QPointF &pos) { - moveTo(obj, pos.x(), pos.y(), msecs); + moveTo(obj, pos.x(), pos.y()); } } diff --git a/qt-ui/profile/animationfunctions.h b/qt-ui/profile/animationfunctions.h index f6c93c7ae..e0338393e 100644 --- a/qt-ui/profile/animationfunctions.h +++ b/qt-ui/profile/animationfunctions.h @@ -9,8 +9,8 @@ class QObject; namespace Animations { void hide(QObject *obj); - void moveTo(QObject *obj, qreal x, qreal y, int msecs = 500); - void moveTo(QObject *obj, const QPointF &pos, int msecs = 500); + void moveTo(QObject *obj, qreal x, qreal y); + void moveTo(QObject *obj, const QPointF &pos); void animDelete(QObject *obj); } diff --git a/qt-ui/profile/diveeventitem.cpp b/qt-ui/profile/diveeventitem.cpp index 40d9e7263..1fd4ef07a 100644 --- a/qt-ui/profile/diveeventitem.cpp +++ b/qt-ui/profile/diveeventitem.cpp @@ -123,7 +123,7 @@ void DiveEventItem::recalculatePos(bool instant) qreal x = hAxis->posAtValue(internalEvent->time.seconds); qreal y = vAxis->posAtValue(depth); if (!instant) - Animations::moveTo(this, x, y, 500); + Animations::moveTo(this, x, y); else setPos(x, y); } |