From d426b948d82d95b8e31ad78d28c76f89d1c26fd6 Mon Sep 17 00:00:00 2001 From: Yasen Date: Fri, 2 Aug 2019 11:46:07 +0200 Subject: [PATCH] Update QGCComboBox.qml Update to the QGCComboBox to use a textRole in the case where it's availble. Some small theme colour fixes. --- src/QmlControls/QGCComboBox.qml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/QmlControls/QGCComboBox.qml b/src/QmlControls/QGCComboBox.qml index 8a7ec80a6..8a02e7642 100644 --- a/src/QmlControls/QGCComboBox.qml +++ b/src/QmlControls/QGCComboBox.qml @@ -26,7 +26,7 @@ ComboBox { background: Rectangle { implicitWidth: ScreenTools.implicitComboBoxWidth implicitHeight: ScreenTools.implicitComboBoxHeight - color: qgcPal.textField + color: qgcPal.window border.width: enabled ? 1 : 0 border.color: "#999" } @@ -37,8 +37,8 @@ ComboBox { width: control.width contentItem: Text { - text: modelData - color: qgcPal.text + text: textRole ? modelData[textRole] : modelData + color: control.currentIndex === index ? qgcPal.buttonHighlightText : qgcPal.buttonText verticalAlignment: Text.AlignVCenter } @@ -59,7 +59,7 @@ ComboBox { anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: centeredLabel ? parent.horizontalCenter : undefined text: control.currentText - color: qgcPal.textFieldText + color: qgcPal.text } } } -- 2.22.0