aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/ComboBox.qml
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-09-21 10:11:04 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2017-09-22 11:20:27 +0000
commit188b5e2a02926b6f1b43793f0bc1f6435bb949c4 (patch)
tree35d358ba9b0757f3065963af5cc9b60c31da0b1f /src/imports/controls/ComboBox.qml
parent72d9c1bfb7f814163880386584cc6edde9158713 (diff)
Default: use palette.text
Make editors and delegates use the "text" color role from palettes. This color role is normally used as a foreground color for the "base" background color. Task-number: QTBUG-63331 Change-Id: Ic08463f54c1b04a4eccf791a576ae792f75bf89b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/ComboBox.qml')
-rw-r--r--src/imports/controls/ComboBox.qml3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml
index f7391112..9e9a53df 100644
--- a/src/imports/controls/ComboBox.qml
+++ b/src/imports/controls/ComboBox.qml
@@ -84,12 +84,11 @@ T.ComboBox {
validator: control.validator
font: control.font
- color: !control.editable && control.visualFocus ? Default.focusColor : Default.textColor
+ color: !control.editable && control.visualFocus ? Default.focusColor : control.palette.text
selectionColor: Default.focusColor
selectedTextColor: Default.textLightColor
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
- opacity: control.enabled ? 1 : 0.3
background: Rectangle {
visible: control.editable && !control.flat