diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-04-18 13:25:42 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-04-18 13:56:24 +0000 |
| commit | 616e86dcb211f47c4d62593de6a051eac70105f7 (patch) | |
| tree | e5d298907274f7063c079b054297dd24f2ec99e2 /src/imports/controls/imagine | |
| parent | 7a6249c8f9fdfb829312135073ce8733d1d721a5 (diff) | |
ComboBox: add implicitIndicatorWidth|Height
Basically same as 704625a0 for AbstractButton.
[ChangeLog][Controls][ComboBox] Added implicitIndicatorWidth and
implicitIndicatorHeight properties.
Change-Id: I1bc9da1ee7ea99dc04ca4458baa06702a4612628
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/imagine')
| -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 b8a8caa2..0068f6df 100644 --- a/src/imports/controls/imagine/ComboBox.qml +++ b/src/imports/controls/imagine/ComboBox.qml @@ -48,7 +48,7 @@ T.ComboBox { contentItem.implicitWidth + background ? (background.leftPadding + background.rightPadding) : 0) implicitHeight: Math.max(implicitBackgroundHeight, Math.max(implicitContentHeight, - indicator ? indicator.implicitHeight : 0) + background ? (background.topPadding + background.bottomPadding) : 0) + implicitIndicatorHeight) + background ? (background.topPadding + background.bottomPadding) : 0) leftPadding: padding + (!control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing) rightPadding: padding + (control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing) |