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-12 09:13:58 +0000 |
commit | 5bd9d44bc7f78ca5946bdef788f1da63b2356a65 (patch) | |
tree | 4ec113f3d28a5796919073f0e249b1a0d7699029 /src/quicktemplates2/qquickpane.cpp | |
parent | 8428c9f4429139e3fa137400bd0721030416c8b2 (diff) |
Control: add implicitBackgroundWidth|Height properties
[ChangeLog][Controls][Control] Added implicitBackgroundWidth and
implicitBackgroundHeight properties that can be used to simplify
complex implicit size bindings.
Task-number: QTBUG-60156
Change-Id: Ia68df187c2a458c84de19f867d76a643134e8b69
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickpane.cpp')
-rw-r--r-- | src/quicktemplates2/qquickpane.cpp | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/src/quicktemplates2/qquickpane.cpp b/src/quicktemplates2/qquickpane.cpp index cf89822a..d4c38fb6 100644 --- a/src/quicktemplates2/qquickpane.cpp +++ b/src/quicktemplates2/qquickpane.cpp @@ -107,8 +107,6 @@ QT_BEGIN_NAMESPACE {Focus Management in Qt Quick Controls 2} */ -static const QQuickItemPrivate::ChangeTypes ImplicitSizeChanges = QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight | QQuickItemPrivate::Destroyed; - QQuickPanePrivate::QQuickPanePrivate() : hasContentWidth(false), hasContentHeight(false), @@ -135,30 +133,16 @@ QQuickItem *QQuickPanePrivate::getContentItem() return new QQuickContentItem(q); } -void QQuickPanePrivate::addImplicitSizeListener(QQuickItem *item) -{ - if (!item) - return; - - QQuickItemPrivate::get(item)->addItemChangeListener(this, ImplicitSizeChanges); -} - -void QQuickPanePrivate::removeImplicitSizeListener(QQuickItem *item) -{ - if (!item) - return; - - QQuickItemPrivate::get(item)->removeItemChangeListener(this, ImplicitSizeChanges); -} - void QQuickPanePrivate::itemImplicitWidthChanged(QQuickItem *item) { + QQuickControlPrivate::itemImplicitWidthChanged(item); if (item == contentItem || item == firstChild) updateContentWidth(); } void QQuickPanePrivate::itemImplicitHeightChanged(QQuickItem *item) { + QQuickControlPrivate::itemImplicitHeightChanged(item); if (item == contentItem || item == firstChild) updateContentHeight(); } |