From ec6cc9921f4b804ed309b7dbfae6ee3b1cf3d8a7 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 21 Feb 2018 23:11:25 +0100 Subject: Control: add implicitContentWidth|Height properties [ChangeLog][Controls][Control] Added implicitContentWidth and implicitContentHeight properties that can be used to simplify complex implicit size bindings. Change-Id: I6ccef572c013605058808ce2ad17f8bd82f49ef0 Reviewed-by: Mitch Curtis --- src/quicktemplates2/qquickswipeview.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/quicktemplates2/qquickswipeview.cpp') diff --git a/src/quicktemplates2/qquickswipeview.cpp b/src/quicktemplates2/qquickswipeview.cpp index 4031513a..0f3b6851 100644 --- a/src/quicktemplates2/qquickswipeview.cpp +++ b/src/quicktemplates2/qquickswipeview.cpp @@ -189,7 +189,7 @@ void QQuickSwipeViewPrivate::itemImplicitWidthChanged(QQuickItem *item) Q_Q(QQuickSwipeView); QQuickContainerPrivate::itemImplicitWidthChanged(item); if (item == q->currentItem()) - updateContentWidth(); + updateImplicitContentWidth(); } void QQuickSwipeViewPrivate::itemImplicitHeightChanged(QQuickItem *item) @@ -197,7 +197,7 @@ void QQuickSwipeViewPrivate::itemImplicitHeightChanged(QQuickItem *item) Q_Q(QQuickSwipeView); QQuickContainerPrivate::itemImplicitHeightChanged(item); if (item == q->currentItem()) - updateContentHeight(); + updateImplicitContentHeight(); } qreal QQuickSwipeViewPrivate::getContentWidth() const @@ -220,7 +220,7 @@ QQuickSwipeView::QQuickSwipeView(QQuickItem *parent) Q_D(QQuickSwipeView); setFlag(ItemIsFocusScope); setActiveFocusOnTab(true); - QObjectPrivate::connect(this, &QQuickContainer::currentItemChanged, d, &QQuickContainerPrivate::updateContentSize); + QObjectPrivate::connect(this, &QQuickContainer::currentItemChanged, d, &QQuickControlPrivate::updateImplicitContentSize); } /*! -- cgit v1.2.3