From 893cc249e6752a72b27ad60e4f7eaea56ae7909c Mon Sep 17 00:00:00 2001 From: Leonardo Sobral Cunha Date: Wed, 21 Apr 2010 13:11:58 +1000 Subject: Fix qmlvisual/animation/parentAnimation autotest The transformOriginPoint was not up tp date when used in ParentChange after this commit: 575f0064bd91e26daa75805c142c10a04a32c2fd. Reviewed-by: Michael Brasser --- src/declarative/util/qdeclarativestateoperations.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp index 8f22de5..0aad498 100644 --- a/src/declarative/util/qdeclarativestateoperations.cpp +++ b/src/declarative/util/qdeclarativestateoperations.cpp @@ -124,6 +124,10 @@ void QDeclarativeParentChangePrivate::doChange(QDeclarativeItem *targetParent, Q const QPointF &point = transform.map(QPointF(target->x(),target->y())); qreal x = point.x(); qreal y = point.y(); + + // setParentItem will update the transformOriginPoint if needed + target->setParentItem(targetParent); + if (ok && target->transformOrigin() != QDeclarativeItem::TopLeft) { qreal tempxt = target->transformOriginPoint().x(); qreal tempyt = target->transformOriginPoint().y(); @@ -137,7 +141,6 @@ void QDeclarativeParentChangePrivate::doChange(QDeclarativeItem *targetParent, Q y += offset.y(); } - target->setParentItem(targetParent); if (ok) { //qDebug() << x << y << rotation << scale; target->setX(x); -- cgit v0.12