diff options
| author | Tony Leinonen <tony.leinonen@qt.io> | 2021-12-22 18:25:57 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-02-03 12:40:09 +0000 |
| commit | dd0fddd795b8301e5a8e809f5983d6eb5c1d45ea (patch) | |
| tree | 2eadc35e8b44f6108be5879b1eecfea22df94414 /src/quick/items | |
| parent | 1c2a34f37675911d2948bb7805d108ae764d0b8c (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.
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>
(cherry picked from commit ebcdde7128c542acddcb07f7abf164492485f4a1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/quick/items')
| -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 aaf3e7568a..75615054c6 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); } |