diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2009-05-19 06:44:16 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2009-05-19 06:44:16 (GMT) |
commit | 8c2f6d4b70bc6e3579c99b49a1dd842678bd7ebe (patch) | |
tree | 2fa1f2cad4e5fc224863323a05c99efc0bd68fe8 /src/declarative | |
parent | 7a9fb0de42835bc4297ac04b901a33f99680f744 (diff) | |
download | Qt-8c2f6d4b70bc6e3579c99b49a1dd842678bd7ebe.zip Qt-8c2f6d4b70bc6e3579c99b49a1dd842678bd7ebe.tar.gz Qt-8c2f6d4b70bc6e3579c99b49a1dd842678bd7ebe.tar.bz2 |
Make sure Flippable updates its back transform correctly.
Previously we didn't update the back transform on geometry changes to
the back element. Now we make sure it is up-to-date whenever we show
it. Also updated anchors (they no longer need to work around this).
Diffstat (limited to 'src/declarative')
-rw-r--r-- | src/declarative/fx/qfxanchors.cpp | 1 | ||||
-rw-r--r-- | src/declarative/fx/qfxflipable.cpp | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/declarative/fx/qfxanchors.cpp b/src/declarative/fx/qfxanchors.cpp index 3eaf47a..235511f 100644 --- a/src/declarative/fx/qfxanchors.cpp +++ b/src/declarative/fx/qfxanchors.cpp @@ -234,7 +234,6 @@ void QFxAnchorsPrivate::remDepend(QFxItem *item) bool QFxAnchorsPrivate::isItemComplete() const { - return true; return item->isComponentComplete(); } diff --git a/src/declarative/fx/qfxflipable.cpp b/src/declarative/fx/qfxflipable.cpp index 24ae428..edcc7cb 100644 --- a/src/declarative/fx/qfxflipable.cpp +++ b/src/declarative/fx/qfxflipable.cpp @@ -169,7 +169,6 @@ void QFxFlipable::setBack(QFxItem *back) children()->append(d->back); if (Front == d->current) d->back->setOpacity(0.); - d->setBackTransform(); } /*! @@ -203,8 +202,6 @@ void QFxFlipablePrivate::_q_updateAxis() axisRotation.axis()->setEndX(axis->endX()); axisRotation.axis()->setEndY(axis->endY()); axisRotation.axis()->setEndZ(axis->endZ()); - - setBackTransform(); } void QFxFlipablePrivate::setBackTransform() @@ -273,8 +270,10 @@ void QFxFlipable::setRotation(qreal angle) d->current = newSide; if (d->front) d->front->setOpacity((d->current==Front)?1.:0.); - if (d->back) + if (d->back) { + d->setBackTransform(); d->back->setOpacity((d->current==Back)?1.:0.); + } emit sideChanged(); } } |