aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/fusion
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2018-04-18 13:25:42 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2018-04-18 13:56:24 +0000
commit616e86dcb211f47c4d62593de6a051eac70105f7 (patch)
treee5d298907274f7063c079b054297dd24f2ec99e2 /src/imports/controls/fusion
parent7a6249c8f9fdfb829312135073ce8733d1d721a5 (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/fusion')
-rw-r--r--src/imports/controls/fusion/ComboBox.qml2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/controls/fusion/ComboBox.qml b/src/imports/controls/fusion/ComboBox.qml
index 18cc69a6..1567b63c 100644
--- a/src/imports/controls/fusion/ComboBox.qml
+++ b/src/imports/controls/fusion/ComboBox.qml
@@ -49,7 +49,7 @@ T.ComboBox {
implicitContentWidth + leftPadding + rightPadding)
implicitHeight: Math.max(implicitBackgroundHeight,
Math.max(implicitContentHeight,
- indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
+ implicitIndicatorHeight) + topPadding + bottomPadding)
leftPadding: padding + (!control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing)
rightPadding: padding + (control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing)