diff options
| author | Joona Petrell <joona.t.petrell@nokia.com> | 2010-07-20 05:14:11 (GMT) |
|---|---|---|
| committer | Joona Petrell <joona.t.petrell@nokia.com> | 2010-07-21 00:33:02 (GMT) |
| commit | 164b2b54922d87a44a60efe6dbbe2fa3b7716820 (patch) | |
| tree | 8379cc7c54a2ebe442df74c157efded2449d9e15 /src/declarative/util | |
| parent | 5cfa17d144055fc58a768818e0dea0325a316e3e (diff) | |
| download | Qt-164b2b54922d87a44a60efe6dbbe2fa3b7716820.zip Qt-164b2b54922d87a44a60efe6dbbe2fa3b7716820.tar.gz Qt-164b2b54922d87a44a60efe6dbbe2fa3b7716820.tar.bz2 | |
Rewinding AnchorChanges should not make target item's implicit width and height explicit
Task-number: QTBUG-12273
Reviewed-by: Michael Brasser
Diffstat (limited to 'src/declarative/util')
| -rw-r--r-- | src/declarative/util/qdeclarativestateoperations.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp index 5590449..2291c16 100644 --- a/src/declarative/util/qdeclarativestateoperations.cpp +++ b/src/declarative/util/qdeclarativestateoperations.cpp @@ -1501,8 +1501,12 @@ void QDeclarativeAnchorChanges::rewind() d->target->setX(d->rewindX); d->target->setY(d->rewindY); - d->target->setWidth(d->rewindWidth); - d->target->setHeight(d->rewindHeight); + if (targetPrivate->widthValid) { + d->target->setWidth(d->rewindWidth); + } + if (targetPrivate->heightValid) { + d->target->setHeight(d->rewindHeight); + } } void QDeclarativeAnchorChanges::saveCurrentValues() |