aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/util/qquickanimatorjob.cpp
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@digia.com>2013-10-28 14:02:25 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-29 12:08:07 +0100
commit192cb97fa6229b8e2b149e90ac49dddd228405d4 (patch)
tree0a4bf942a46f9ecd6551becb17c3e997fdb4697d /src/quick/util/qquickanimatorjob.cpp
parent16242b144e3a886514000909c446201b3de06a67 (diff)
Track size changes from transform animators.
When the size changes, so will most likely also the transform origin, so we need to check for it and update accordingly. Task-number: QTBUG-34140 Change-Id: Ic3d6c1ac599db499ab196a8cbe550308a75e837f Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'src/quick/util/qquickanimatorjob.cpp')
-rw-r--r--src/quick/util/qquickanimatorjob.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/quick/util/qquickanimatorjob.cpp b/src/quick/util/qquickanimatorjob.cpp
index 78708bdf81..fffb9fc65f 100644
--- a/src/quick/util/qquickanimatorjob.cpp
+++ b/src/quick/util/qquickanimatorjob.cpp
@@ -316,7 +316,8 @@ void QQuickTransformAnimatorJob::Helper::sync()
{
const quint32 mask = QQuickItemPrivate::Position
| QQuickItemPrivate::BasicTransform
- | QQuickItemPrivate::TransformOrigin;
+ | QQuickItemPrivate::TransformOrigin
+ | QQuickItemPrivate::Size;
QQuickItemPrivate *d = QQuickItemPrivate::get(item);
if (d->extra.isAllocated()
@@ -347,7 +348,7 @@ void QQuickTransformAnimatorJob::Helper::sync()
rotation = item->rotation();
}
- if (dirty & QQuickItemPrivate::TransformOrigin) {
+ if (dirty & (QQuickItemPrivate::TransformOrigin | QQuickItemPrivate::Size)) {
QPointF o = item->transformOriginPoint();
ox = o.x();
oy = o.y();