Browse Source

Fix dropdown indicator color

QGC4.4
Don Gagne 6 years ago
parent
commit
0dfff01b00
  1. 12
      src/QmlControls/QGCComboBox.qml
  2. 3
      src/QmlControls/QGCOptionsComboBox.qml

12
src/QmlControls/QGCComboBox.qml

@ -23,10 +23,14 @@ ComboBox { @@ -23,10 +23,14 @@ ComboBox {
property bool centeredLabel: false
property var _qgcPal: QGCPalette { colorGroupEnabled: enabled }
Component.onCompleted: indicator.color = Qt.binding(function() { return _qgcPal.text })
background: Rectangle {
implicitWidth: ScreenTools.implicitComboBoxWidth
implicitHeight: ScreenTools.implicitComboBoxHeight
color: qgcPal.window
color: _qgcPal.window
border.width: enabled ? 1 : 0
border.color: "#999"
}
@ -38,12 +42,12 @@ ComboBox { @@ -38,12 +42,12 @@ ComboBox {
contentItem: Text {
text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData
color: control.currentIndex === index ? qgcPal.buttonHighlightText : qgcPal.buttonText
color: control.currentIndex === index ? _qgcPal.buttonHighlightText : _qgcPal.buttonText
verticalAlignment: Text.AlignVCenter
}
background: Rectangle {
color: control.currentIndex === index ? qgcPal.buttonHighlight : qgcPal.button
color: control.currentIndex === index ? _qgcPal.buttonHighlight : _qgcPal.button
}
highlighted: control.highlightedIndex === index
@ -59,7 +63,7 @@ ComboBox { @@ -59,7 +63,7 @@ ComboBox {
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: centeredLabel ? parent.horizontalCenter : undefined
text: control.currentText
color: qgcPal.text
color: _qgcPal.text
}
}
}

3
src/QmlControls/QGCOptionsComboBox.qml

@ -30,6 +30,8 @@ ComboBox { @@ -30,6 +30,8 @@ ComboBox {
property string _flashText
property bool _showFlash: false
Component.onCompleted: indicator.color = Qt.binding(function() { return _controlQGCPal.text })
background: Rectangle {
implicitWidth: ScreenTools.implicitComboBoxWidth
implicitHeight: ScreenTools.implicitComboBoxHeight
@ -58,7 +60,6 @@ ComboBox { @@ -58,7 +60,6 @@ ComboBox {
(modelData.fact.typeIsBool ? (modelData.fact.value === false ? Qt.Unchecked : Qt.Checked) : (modelData.fact.value === 0 ? Qt.Unchecked : Qt.Checked)) :
modelData.checked }
contentItem: RowLayout {
spacing: ScreenTools.defaultFontPixelWidth

Loading…
Cancel
Save