ComboBox: add more padding to the indicators

For the upcoming editable comboboxes, only the area covered by the indicator
acts as a pressable button. The rest is editor area, which gains focus
on press, but doesn't trigger the popup. The button must be large enough
to be usable on touch.

- Default: the width has been increased from 28 to 40
- Material: the width has been increased from 24 to 40
- Universal: the width is already 32 (which matches with SpinBox)

Task-number: QTBUG-53876
Change-Id: I2312e92947826b03fa28da2e9e9d844325fc7896
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

11 files changed, 6 insertions, 6 deletions

diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml
index 4519838c..d50f5fe4 100644
--- a/src/imports/controls/ComboBox.qml
+++ b/src/imports/controls/ComboBox.qml
@@ -71,8 +71,8 @@ T.ComboBox {
     }
 
     contentItem: Text {
-        leftPadding: 12
-        rightPadding: 12
+        leftPadding: control.mirrored ? 0 : 12
+        rightPadding: control.mirrored ? 12 : 0
         topPadding: 6 - control.padding
         bottomPadding: 6 - control.padding
 
diff --git a/src/imports/controls/images/double-arrow.png b/src/imports/controls/images/double-arrow.png
index a6d84dbc..af403904 100644
--- a/src/imports/controls/images/double-arrow.png
+++ b/src/imports/controls/images/double-arrow.png
diff --git a/src/imports/controls/images/double-arrow@2x.png b/src/imports/controls/images/double-arrow@2x.png
index 36ffd5fe..b63f5c57 100644
--- a/src/imports/controls/images/double-arrow@2x.png
+++ b/src/imports/controls/images/double-arrow@2x.png
diff --git a/src/imports/controls/images/double-arrow@3x.png b/src/imports/controls/images/double-arrow@3x.png
index 5a2a59fe..c742e309 100644
--- a/src/imports/controls/images/double-arrow@3x.png
+++ b/src/imports/controls/images/double-arrow@3x.png
diff --git a/src/imports/controls/images/double-arrow@4x.png b/src/imports/controls/images/double-arrow@4x.png
index 22977545..488a331d 100644
--- a/src/imports/controls/images/double-arrow@4x.png
+++ b/src/imports/controls/images/double-arrow@4x.png
diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml
index fa287ac1..814f8ae7 100644
--- a/src/imports/controls/material/ComboBox.qml
+++ b/src/imports/controls/material/ComboBox.qml
@@ -75,8 +75,8 @@ T.ComboBox {
 
     contentItem: Text {
         padding: 6
-        leftPadding: 12
-        rightPadding: 12
+        leftPadding: control.mirrored ? 0 : 12
+        rightPadding: control.mirrored ? 12 : 0
 
         text: control.displayText
         font: control.font
diff --git a/src/imports/controls/material/images/drop-indicator.png b/src/imports/controls/material/images/drop-indicator.png
index 03c77486..0f61fbb7 100644
--- a/src/imports/controls/material/images/drop-indicator.png
+++ b/src/imports/controls/material/images/drop-indicator.png
diff --git a/src/imports/controls/material/images/drop-indicator@2x.png b/src/imports/controls/material/images/drop-indicator@2x.png
index 6656f753..8f555eee 100644
--- a/src/imports/controls/material/images/drop-indicator@2x.png
+++ b/src/imports/controls/material/images/drop-indicator@2x.png
diff --git a/src/imports/controls/material/images/drop-indicator@3x.png b/src/imports/controls/material/images/drop-indicator@3x.png
index 97f12895..7fd2af1f 100644
--- a/src/imports/controls/material/images/drop-indicator@3x.png
+++ b/src/imports/controls/material/images/drop-indicator@3x.png
diff --git a/src/imports/controls/material/images/drop-indicator@4x.png b/src/imports/controls/material/images/drop-indicator@4x.png
index 0046692f..7e81fdd8 100644
--- a/src/imports/controls/material/images/drop-indicator@4x.png
+++ b/src/imports/controls/material/images/drop-indicator@4x.png
diff --git a/src/imports/controls/universal/ComboBox.qml b/src/imports/controls/universal/ComboBox.qml
index 37e1997a..bc196479 100644
--- a/src/imports/controls/universal/ComboBox.qml
+++ b/src/imports/controls/universal/ComboBox.qml
@@ -69,8 +69,8 @@ T.ComboBox {
     }
 
     contentItem: Text {
-        leftPadding: 12
-        rightPadding: 10
+        leftPadding: control.mirrored ? 0 : 12
+        rightPadding: control.mirrored ? 10 : 0
         topPadding: 5 - control.topPadding
         bottomPadding: 7 - control.bottomPadding