diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-04-12 14:53:59 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-04-13 11:26:49 +0000 |
| commit | b4334eed2fd6b5c33dcd464e44c3966deaca2276 (patch) | |
| tree | 2f103c3af84aaebd96688d2832b72e79db3a64ed /src/imports/controls/imagine/ComboBox.qml | |
| parent | ec6cc9921f4b804ed309b7dbfae6ee3b1cf3d8a7 (diff) | |
Use implicitContentWidth and implicitContentHeight
A simple search'n'replace change without hidden functional changes.
Change-Id: I11c76846028665e66dfc6b4359adb33f77cd88ae
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/imagine/ComboBox.qml')
| -rw-r--r-- | src/imports/controls/imagine/ComboBox.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/controls/imagine/ComboBox.qml b/src/imports/controls/imagine/ComboBox.qml index a7b835a4..b8a8caa2 100644 --- a/src/imports/controls/imagine/ComboBox.qml +++ b/src/imports/controls/imagine/ComboBox.qml @@ -47,7 +47,7 @@ T.ComboBox { implicitWidth: Math.max(implicitBackgroundWidth, contentItem.implicitWidth + background ? (background.leftPadding + background.rightPadding) : 0) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + background ? (background.topPadding + background.bottomPadding) : 0) leftPadding: padding + (!control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing) |