aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquickstackview_p.cpp
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-01-11 15:44:16 +0100
committerJ-P Nurmi <jpnurmi@qt.io>2017-01-12 14:36:13 +0000
commitdef88e018576e6e2185ff6fa4b6e4fac885a6e10 (patch)
tree6a5debfca7d07fd33f02526fa24607f9f2a3187f /src/quicktemplates2/qquickstackview_p.cpp
parentf0508c72750d5c44834b6a0f9db3a76431350158 (diff)
Add attached StackView.visible property
[ChangeLog][Controls][StackView] Added attached StackView.visible property that can be used to control whether items below the top- most item are kept visible. Task-number: QTBUG-56801 Change-Id: Ieead0d476f254886cff5f8457bb5c5d23cb7de8a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickstackview_p.cpp')
-rw-r--r--src/quicktemplates2/qquickstackview_p.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/quicktemplates2/qquickstackview_p.cpp b/src/quicktemplates2/qquickstackview_p.cpp
index 441768f7..4f592f45 100644
--- a/src/quicktemplates2/qquickstackview_p.cpp
+++ b/src/quicktemplates2/qquickstackview_p.cpp
@@ -50,15 +50,16 @@ QQuickStackViewPrivate::QQuickStackViewPrivate() : busy(false), currentItem(null
{
}
-void QQuickStackViewPrivate::setCurrentItem(QQuickItem *item)
+void QQuickStackViewPrivate::setCurrentItem(QQuickStackElement *element)
{
Q_Q(QQuickStackView);
+ QQuickItem *item = element ? element->item : nullptr;
if (currentItem == item)
return;
currentItem = item;
- if (item)
- item->setVisible(true);
+ if (element)
+ element->setVisible(true);
emit q->currentItemChanged();
}
@@ -243,8 +244,7 @@ void QQuickStackViewPrivate::viewItemTransitionFinished(QQuickItemViewTransition
element->setStatus(QQuickStackView::Active);
} else if (element->status == QQuickStackView::Deactivating) {
element->setStatus(QQuickStackView::Inactive);
- if (element->item)
- element->item->setVisible(false);
+ element->setVisible(false);
if (element->removal || element->isPendingRemoval())
removals += element;
}