Merge pull request #5347 from DonLakeFlyer/ComboBox

Fix coloring of QGCComboBox dropdowns

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
+            font.pointSize:             ScreenTools.defaultFontPointSize
-            __labelColor:               combo._qgcPal.text
+            font.family:                ScreenTools.normalFontFamily
-            __selectedLabelColor:       combo._qgcPal.buttonText
+            __labelColor:               combo._qgcPal.buttonText
+            __selectedLabelColor:       combo._qgcPal.buttonHighlightText
             __selectedBackgroundColor:  combo._qgcPal.buttonHighlight
+            __backgroundColor:          combo._qgcPal.button
             __maxPopupHeight:           600
             __menuItemType:             "comboboxitem"
             __scrollerStyle:            ScrollViewStyle { }