diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-04-19 07:20:09 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-04-19 09:34:53 +0000 |
| commit | 06071fd14d6cff4d3f9b3cdff92f5ddf4bf2b3bc (patch) | |
| tree | 270a4f1d68b5b6ff30013ca0b47969fafbc96221 /src/imports/controls/imagine | |
| parent | 37ef78bef2a1b8f6de7b196015a0343385ba36aa (diff) | |
GroupBox: add implicitLabelWidth|Height
[ChangeLog][Controls][GroupBox] Added implicitLabelWidth and
implicitLabelHeight properties.
Change-Id: Ieae54a3b3044b306cd00f45101c6573b5291352d
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/imagine')
| -rw-r--r-- | src/imports/controls/imagine/GroupBox.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/imagine/GroupBox.qml b/src/imports/controls/imagine/GroupBox.qml index d18af5ba..af6e2376 100644 --- a/src/imports/controls/imagine/GroupBox.qml +++ b/src/imports/controls/imagine/GroupBox.qml @@ -44,11 +44,11 @@ T.GroupBox { id: control implicitWidth: Math.max(implicitBackgroundWidth, - label ? label.implicitWidth + leftPadding + rightPadding : 0, + implicitLabelWidth + leftPadding + rightPadding, contentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, contentHeight + topPadding + bottomPadding) - topPadding: (background ? background.topPadding : 0) + (label && label.implicitWidth > 0 ? label.implicitHeight + spacing : 0) + topPadding: (background ? background.topPadding : 0) + (implicitLabelWidth > 0 ? implicitLabelHeight + spacing : 0) leftPadding: background ? background.leftPadding : 0 rightPadding: background ? background.rightPadding : 0 bottomPadding: background ? background.bottomPadding : 0 |