From 40d2540cfb6811886d4be6ed856beaa41d197cfb Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Tue, 27 Jun 2017 09:57:36 -0700
Subject: [PATCH] Fix coloring

---
 src/QmlControls/QGCComboBox.qml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/QmlControls/QGCComboBox.qml b/src/QmlControls/QGCComboBox.qml
index 0ba3a6672..62bc3d3f5 100644
--- a/src/QmlControls/QGCComboBox.qml
+++ b/src/QmlControls/QGCComboBox.qml
@@ -59,13 +59,10 @@ Button {
             implicitHeight: text.implicitHeight
             baselineOffset: text.y + text.baselineOffset
 
-            Text {
+            QGCLabel {
                 id:                     text
                 anchors.verticalCenter: parent.verticalCenter
-                antialiasing:           true
                 text:                   control.currentText
-                font.pointSize:         pointSize
-                font.family:            ScreenTools.normalFontFamily
                 color:                  control._qgcPal.buttonText
             }
         }
@@ -107,10 +104,12 @@ Button {
         __visualItem:   combo
 
         style: MenuStyle {
-            font:                       combo.font
-            __labelColor:               combo._qgcPal.text
-            __selectedLabelColor:       combo._qgcPal.buttonText
+            font.pointSize:             ScreenTools.defaultFontPointSize
+            font.family:                ScreenTools.normalFontFamily
+            __labelColor:               combo._qgcPal.buttonText
+            __selectedLabelColor:       combo._qgcPal.buttonHighlightText
             __selectedBackgroundColor:  combo._qgcPal.buttonHighlight
+            __backgroundColor:          combo._qgcPal.button
             __maxPopupHeight:           600
             __menuItemType:             "comboboxitem"
             __scrollerStyle:            ScrollViewStyle { }
-- 
2.22.0