summaryrefslogtreecommitdiffstats
path: root/qt-ui/profile/animationfunctions.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'qt-ui/profile/animationfunctions.cpp')
-rw-r--r--qt-ui/profile/animationfunctions.cpp24
1 files changed, 16 insertions, 8 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());
}
}