summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2009-07-27 05:00:49 (GMT)
committerLars Knoll <lars.knoll@nokia.com>2009-07-29 03:47:21 (GMT)
commit1a781d12fb06541fe921e1506b28007b34494a9e (patch)
tree919fd69d9248050b45f8faf7ca73e197d106730b
parentd53f55357ed9581b02088dff95fbe955412f476d (diff)
downloadQt-1a781d12fb06541fe921e1506b28007b34494a9e.zip
Qt-1a781d12fb06541fe921e1506b28007b34494a9e.tar.gz
Qt-1a781d12fb06541fe921e1506b28007b34494a9e.tar.bz2
always set the correct point for the transform origin.
-rw-r--r--src/declarative/fx/qfxitem.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp
index efdd4fc..0cc1fbc 100644
--- a/src/declarative/fx/qfxitem.cpp
+++ b/src/declarative/fx/qfxitem.cpp
@@ -1044,12 +1044,8 @@ void QFxItem::geometryChanged(const QRectF &newGeometry,
if (d->_anchors)
d->_anchors->d_func()->updateMe();
- if (newGeometry.size() != oldGeometry.size()) {
- if (rotation() && transformOrigin() != QFxItem::TopLeft)
- setRotation(rotation());
- if (scale() && transformOrigin() != QFxItem::TopLeft)
- setScale(scale());
- }
+ if (transformOrigin() != QFxItem::TopLeft)
+ setTransformOriginPoint(d->computeTransformOrigin());
if (newGeometry.x() != oldGeometry.x())
emit xChanged();