diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-02-21 23:11:25 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-04-13 11:26:45 +0000 |
| commit | ec6cc9921f4b804ed309b7dbfae6ee3b1cf3d8a7 (patch) | |
| tree | 02e9b87f41a139557c12333cc5473c038e429578 /src/quicktemplates2/qquickswipeview.cpp | |
| parent | 3e3a4062ae8051d862b39420e0955ac5e9fbe7a2 (diff) | |
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 <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickswipeview.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickswipeview.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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); } /*! |