diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-08-26 17:53:41 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-08-27 14:04:11 +0000 |
| commit | 4a6292afc8609c2b51a53ba52ff14adcfc0833fa (patch) | |
| tree | 28d24918710c6dad92d369be1c9a8179a16b9303 /src/controls | |
| parent | 162ae5c4a7ffa45f63911801a094fe049750cdc3 (diff) | |
StackView: fix transitions
Passing null view bounds for the transitionable exit item helps to kick
off the transition as appropriate. Otherwise the view transition item
determines in QQuickItemViewTransitionableItem::prepareTransition()
that no transition is necessary.
Change-Id: Icb664725c4393ef3bb894b71a5912652f82c9da0
Task-number: QTBUG-47949
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/controls')
| -rw-r--r-- | src/controls/qquickstackview_p.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/controls/qquickstackview_p.cpp b/src/controls/qquickstackview_p.cpp index 6568d344..c0969199 100644 --- a/src/controls/qquickstackview_p.cpp +++ b/src/controls/qquickstackview_p.cpp @@ -403,7 +403,7 @@ void QQuickStackViewPrivate::popTransition(QQuickStackElement *enter, QQuickStac exit->startTransition(transitioner); } if (enter) { - if (immediate || !enter->prepareTransition(transitioner, viewBounds)) + if (immediate || !enter->prepareTransition(transitioner, QRectF())) completeTransition(enter, transitioner->removeDisplacedTransition); else enter->startTransition(transitioner); @@ -434,7 +434,7 @@ void QQuickStackViewPrivate::pushTransition(QQuickStackElement *enter, QQuickSta enter->startTransition(transitioner); } if (exit) { - if (immediate || !exit->prepareTransition(transitioner, viewBounds)) + if (immediate || !exit->prepareTransition(transitioner, QRectF())) completeTransition(exit, transitioner->addDisplacedTransition); else exit->startTransition(transitioner); @@ -466,7 +466,7 @@ void QQuickStackViewPrivate::replaceTransition(QQuickStackElement *enter, QQuick enter->startTransition(transitioner); } if (exit) { - if (immediate || !exit->prepareTransition(transitioner, viewBounds)) + if (immediate || !exit->prepareTransition(transitioner, QRectF())) completeTransition(exit, transitioner->addDisplacedTransition); else exit->startTransition(transitioner); |