Skip to content

Q
qgroundcontrol
Unverified Commit 07d286c9 authored by Gus Grubba's avatar Gus Grubba Committed by GitHub
Browse files
Options

Merge pull request #7658 from yasendimov/pr-combobox_fix 

Update QGCComboBox.qml
parents ecbdc6de d426b948
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
src/QmlControls/QGCComboBox.qml
View file @ 07d286c9
...@@ -26,7 +26,7 @@ ComboBox { ...@@ -26,7 +26,7 @@ ComboBox {
background: Rectangle { background: Rectangle {
implicitWidth: ScreenTools.implicitComboBoxWidth implicitWidth: ScreenTools.implicitComboBoxWidth
implicitHeight: ScreenTools.implicitComboBoxHeight implicitHeight: ScreenTools.implicitComboBoxHeight
color: qgcPal.textField color: qgcPal.window
border.width: enabled ? 1 : 0 border.width: enabled ? 1 : 0
border.color: "#999" border.color: "#999"
} }
...@@ -37,8 +37,8 @@ ComboBox { ...@@ -37,8 +37,8 @@ ComboBox {
width: control.width width: control.width
contentItem: Text { contentItem: Text {
text: modelData text: textRole ? modelData[textRole] : modelData
color: qgcPal.text color: control.currentIndex === index ? qgcPal.buttonHighlightText : qgcPal.buttonText
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
} }
...@@ -59,7 +59,7 @@ ComboBox { ...@@ -59,7 +59,7 @@ ComboBox {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: centeredLabel ? parent.horizontalCenter : undefined anchors.horizontalCenter: centeredLabel ? parent.horizontalCenter : undefined
text: control.currentText text: control.currentText
color: qgcPal.textFieldText color: qgcPal.text
} }
} }
} }
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