aboutsummaryrefslogtreecommitdiffstats
path: root/src/templates/qquickstackview_p.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/templates/qquickstackview_p.cpp')
-rw-r--r--src/templates/qquickstackview_p.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/templates/qquickstackview_p.cpp b/src/templates/qquickstackview_p.cpp
index a66e7d21..9ee0bdb3 100644
--- a/src/templates/qquickstackview_p.cpp
+++ b/src/templates/qquickstackview_p.cpp
@@ -461,28 +461,28 @@ void QQuickStackViewPrivate::replaceTransition(QQuickStackElement *enter, QQuick
{
ensureTransitioner();
- if (enter) {
- enter->setStatus(QQuickStackView::Activating);
- enter->transitionNextReposition(transitioner, QQuickItemViewTransitioner::AddTransition, true);
- }
if (exit) {
exit->removal = true;
exit->setStatus(QQuickStackView::Deactivating);
- exit->transitionNextReposition(transitioner, QQuickItemViewTransitioner::AddTransition, false);
+ exit->transitionNextReposition(transitioner, QQuickItemViewTransitioner::MoveTransition, false);
}
-
if (enter) {
- if (immediate || !enter->prepareTransition(transitioner, viewBounds))
- completeTransition(enter, transitioner->addTransition);
- else
- enter->startTransition(transitioner);
+ enter->setStatus(QQuickStackView::Activating);
+ enter->transitionNextReposition(transitioner, QQuickItemViewTransitioner::MoveTransition, true);
}
+
if (exit) {
if (immediate || !exit->prepareTransition(transitioner, QRectF()))
- completeTransition(exit, transitioner->addDisplacedTransition);
+ completeTransition(exit, transitioner->moveDisplacedTransition);
else
exit->startTransition(transitioner);
}
+ if (enter) {
+ if (immediate || !enter->prepareTransition(transitioner, viewBounds))
+ completeTransition(enter, transitioner->moveTransition);
+ else
+ enter->startTransition(transitioner);
+ }
if (!immediate)
setBusy(true);