diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-02-24 13:11:38 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-02-24 15:43:25 +0000 |
commit | e7409625f24ed8a32bb303b948bfdf077b74ea77 (patch) | |
tree | 4e155968f8d31ab832aaa6d8a716de37643138a9 | |
parent | 732c519dc6e9a2ea3d41e9bc5833d66a12a79503 (diff) |
Fix QQuickStackViewPrivate::startTransition()
This seems like a mistake that slipped in when popTransition(),
pushTransition() and replaceTransition() were merged in acecb06.
Only immediate push/pop/replace operations were affected, where
the animations were force-completed by hand. In this scenario it
was always passing the pop transitions for completion, even if
the current operation was push or replace.
Change-Id: I6a940953feaefe6643ddae26c070856a66bf6c10
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r-- | src/quicktemplates2/qquickstackview_p.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickstackview_p.cpp b/src/quicktemplates2/qquickstackview_p.cpp index fd367f08..89b3c6e3 100644 --- a/src/quicktemplates2/qquickstackview_p.cpp +++ b/src/quicktemplates2/qquickstackview_p.cpp @@ -208,13 +208,13 @@ void QQuickStackViewPrivate::startTransition(const QQuickStackTransition &first, if (first.element) { if (immediate || !first.element->item || !first.element->prepareTransition(transitioner, first.viewBounds)) - completeTransition(first.element, transitioner->removeTransition, first.status); + completeTransition(first.element, first.transition, first.status); else first.element->startTransition(transitioner, first.status); } if (second.element) { if (immediate || !second.element->item || !second.element->prepareTransition(transitioner, second.viewBounds)) - completeTransition(second.element, transitioner->removeDisplacedTransition, second.status); + completeTransition(second.element, second.transition, second.status); else second.element->startTransition(transitioner, second.status); } |