Commit 50d612da authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #5347 from DonLakeFlyer/ComboBox

Fix coloring of QGCComboBox dropdowns
parents 3ed158a6 40d2540c
...@@ -59,13 +59,10 @@ Button { ...@@ -59,13 +59,10 @@ Button {
implicitHeight: text.implicitHeight implicitHeight: text.implicitHeight
baselineOffset: text.y + text.baselineOffset baselineOffset: text.y + text.baselineOffset
Text { QGCLabel {
id: text id: text
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
antialiasing: true
text: control.currentText text: control.currentText
font.pointSize: pointSize
font.family: ScreenTools.normalFontFamily
color: control._qgcPal.buttonText color: control._qgcPal.buttonText
} }
} }
...@@ -107,10 +104,12 @@ Button { ...@@ -107,10 +104,12 @@ Button {
__visualItem: combo __visualItem: combo
style: MenuStyle { 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 __selectedBackgroundColor: combo._qgcPal.buttonHighlight
__backgroundColor: combo._qgcPal.button
__maxPopupHeight: 600 __maxPopupHeight: 600
__menuItemType: "comboboxitem" __menuItemType: "comboboxitem"
__scrollerStyle: ScrollViewStyle { } __scrollerStyle: ScrollViewStyle { }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment