diff options
| author | Tony Leinonen <tony.leinonen@qt.io> | 2021-12-22 18:25:57 +0200 |
|---|---|---|
| committer | Tony Leinonen <tony.leinonen@qt.io> | 2021-12-27 09:36:45 +0000 |
| commit | ebcdde7128c542acddcb07f7abf164492485f4a1 (patch) | |
| tree | ea08ac71de6ee116d88d90e73d5534fb806eabba | |
| parent | 39aee682bf388e191a409485cbbe2e01996bc163 (diff) | |
Fix incorrect behavior after displace transition
to.x and to.y use itemX and itemY. This caused them to be off sync.
Override item's fromValues with itemX and itemY calls to sync them back.
Pick-to: 5.15 6.2
Task-number: QTBUG-89193
Change-Id: If65f11a55101ee7cbc463806bcef0072fea00ebd
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| -rw-r--r-- | src/quick/items/qquickitemviewtransition.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/items/qquickitemviewtransition.cpp b/src/quick/items/qquickitemviewtransition.cpp index 3c84468370..f947c085bc 100644 --- a/src/quick/items/qquickitemviewtransition.cpp +++ b/src/quick/items/qquickitemviewtransition.cpp @@ -125,6 +125,8 @@ void QQuickItemViewTransitionJob::startTransition(QQuickItemViewTransitionableIt actions << QQuickStateAction(item->item, QLatin1String("x"), QVariant(to.x())); actions << QQuickStateAction(item->item, QLatin1String("y"), QVariant(to.y())); + actions[0].fromValue = item->itemX(); + actions[1].fromValue = item->itemY(); m_transitioner->runningJobs << this; QQuickTransitionManager::transition(actions, trans, item->item); } |