diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-04-10 15:52:01 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-04-11 11:12:57 +0000 |
| commit | 086dc4316b1008453ac190bab414a1c46cde79ef (patch) | |
| tree | df469b5166244af0239451812a18b64f99c6443f /src/imports/controls/Container.qml | |
| parent | 52990db1f07bdf8f236dcb9b2ac06480c39437f7 (diff) | |
Promote contentWidth and contentHeight to QQuickContainer
Now we have contentWidth and contentHeight promoted/unified to
QQuickPane and QQuickContainer, and all relevant types inherit the
properties from there. The next step is to promote read-only versions
all the way up to the QQuickControl base class.
Change-Id: Ic6ed5d7b7852b0c7faaa59b9a261c360bc63fb6a
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/Container.qml')
| -rw-r--r-- | src/imports/controls/Container.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/Container.qml b/src/imports/controls/Container.qml index 896091d8..f43342be 100644 --- a/src/imports/controls/Container.qml +++ b/src/imports/controls/Container.qml @@ -41,7 +41,7 @@ T.Container { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, - (contentItem ? contentItem.implicitWidth : 0) + leftPadding + rightPadding) + contentWidth + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, - (contentItem ? contentItem.implicitHeight : 0) + topPadding + bottomPadding) + contentHeight + topPadding + bottomPadding) } |