diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2018-05-02 11:34:45 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2018-05-02 12:22:15 +0000 |
commit | fac7e9e87caf78554bc33b80fe72dc40518fcc76 (patch) | |
tree | 2fa02d844a5f8d3ab8fa0c23913614a802c0ac29 /src/quicktemplates2/qquickcontrol.cpp | |
parent | 012556df80470e294c1adaf1b442e1eb8729c598 (diff) |
Add missing implicitBackground{Width|Height} to non-QQuickControls
Same as 5bd9d44b for QQuickControl.
[ChangeLog][Controls][Label] Added implicitBackgroundWidth and
implicitBackgroundHeight properties that can be used to simplify
complex implicit size bindings.
[ChangeLog][Controls][TextArea] Added implicitBackgroundWidth and
implicitBackgroundHeight properties that can be used to simplify
complex implicit size bindings.
[ChangeLog][Controls][TextField] Added implicitBackgroundWidth and
implicitBackgroundHeight properties that can be used to simplify
complex implicit size bindings.
Change-Id: Idcc2d9af8df086b41c15f352506fd8afdbb2e3e7
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickcontrol.cpp')
-rw-r--r-- | src/quicktemplates2/qquickcontrol.cpp | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp index afb7c08a..81950ee5 100644 --- a/src/quicktemplates2/qquickcontrol.cpp +++ b/src/quicktemplates2/qquickcontrol.cpp @@ -879,16 +879,26 @@ void QQuickControlPrivate::updateBaselineOffset() void QQuickControlPrivate::addImplicitSizeListener(QQuickItem *item, ChangeTypes changes) { - if (!item) - return; - QQuickItemPrivate::get(item)->addItemChangeListener(this, changes); + addImplicitSizeListener(item, this, changes); } void QQuickControlPrivate::removeImplicitSizeListener(QQuickItem *item, ChangeTypes changes) { - if (!item) + removeImplicitSizeListener(item, this, changes); +} + +void QQuickControlPrivate::addImplicitSizeListener(QQuickItem *item, QQuickItemChangeListener *listener, ChangeTypes changes) +{ + if (!item || !listener) + return; + QQuickItemPrivate::get(item)->addItemChangeListener(listener, changes); +} + +void QQuickControlPrivate::removeImplicitSizeListener(QQuickItem *item, QQuickItemChangeListener *listener, ChangeTypes changes) +{ + if (!item || !listener) return; - QQuickItemPrivate::get(item)->removeItemChangeListener(this, changes); + QQuickItemPrivate::get(item)->removeItemChangeListener(listener, changes); } void QQuickControlPrivate::itemImplicitWidthChanged(QQuickItem *item) |