mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Animation speed is a value, not a boolean

Browse source 
This breaks compatibility with old preferences, but it's a single
key and not that very important so I don't think it's a bigger issue
I've renamed prefs.animation to prefs.animation_speed to denote
that it's a value, and not a state.

Also, fixed the places that were treating it as a state (on/off)
to treat it like a correct value.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2014-07-21 19:10:31 -03:00 • committed by Dirk Hohndel
parent 82bcb1767c
commit 65eefe7b59
6 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
qt-ui/profile/animationfunctions.cpp
View file

@ -8,7 +8,7 @@ namespace Animations {
void hide(QObject *obj)
{
if (prefs.animation != 0) {
if (prefs.animation_speed != 0) {
QPropertyAnimation *animation = new QPropertyAnimation(obj, "opacity");
animation->setStartValue(1);
animation->setEndValue(0);
@ -20,7 +20,7 @@ namespace Animations {
void animDelete(QObject *obj)
{
if (prefs.animation != 0) {
if (prefs.animation_speed != 0) {
QPropertyAnimation *animation = new QPropertyAnimation(obj, "opacity");
obj->connect(animation, SIGNAL(finished()), SLOT(deleteLater()));
animation->setStartValue(1);
@ -33,9 +33,9 @@ namespace Animations {
void moveTo(QObject *obj, qreal x, qreal y)
{
if (prefs.animation != 0) {
if (prefs.animation_speed != 0) {
QPropertyAnimation *animation = new QPropertyAnimation(obj, "pos");
animation->setDuration(prefs.animation);
animation->setDuration(prefs.animation_speed);
animation->setStartValue(obj->property("pos").toPointF());
animation->setEndValue(QPointF(x, y));
animation->start(QAbstractAnimation::DeleteWhenStopped);
@ -46,9 +46,9 @@ namespace Animations {
void scaleTo(QObject *obj, qreal scale)
{
if (prefs.animation != 0) {
if (prefs.animation_speed != 0) {
QPropertyAnimation *animation = new QPropertyAnimation(obj, "scale");
animation->setDuration(prefs.animation);
animation->setDuration(prefs.animation_speed);
animation->setStartValue(obj->property("scale").toReal());
animation->setEndValue(QVariant::fromValue(scale));
animation->setEasingCurve(QEasingCurve::InCubic);