Skip to content

Q
qgroundcontrol
Commit 13bf81aa authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #3528 from DonLakeFlyer/PX4FM 

PX4 Flight Mode: Fix label coloring
parents 935e1ca9 2d4d8805
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml
View file @ 13bf81aa
...@@ -147,7 +147,7 @@ Item { ...@@ -147,7 +147,7 @@ Item {
QGCLabel { QGCLabel {
anchors.baseline: returnCombo.baseline anchors.baseline: returnCombo.baseline
text: "Return switch:" text: "Return switch:"
color: fact.value == 0 ? qgcPal.text : (controller.rcChannelValues[fact.value - 1] >= 1500 ? "yellow" : qgcPal.text) color: parent.fact.value == 0 ? qgcPal.text : (controller.rcChannelValues[parent.fact.value - 1] >= 1500 ? "yellow" : qgcPal.text)
} }
FactComboBox { FactComboBox {
...@@ -166,7 +166,7 @@ Item { ...@@ -166,7 +166,7 @@ Item {
QGCLabel { QGCLabel {
anchors.baseline: killCombo.baseline anchors.baseline: killCombo.baseline
text: "Kill switch:" text: "Kill switch:"
color: fact.value == 0 ? qgcPal.text : (controller.rcChannelValues[fact.value - 1] >= 1500 ? "yellow" : qgcPal.text) color: parent.fact.value == 0 ? qgcPal.text : (controller.rcChannelValues[parent.fact.value - 1] >= 1500 ? "yellow" : qgcPal.text)
} }
FactComboBox { FactComboBox {
...@@ -185,7 +185,7 @@ Item { ...@@ -185,7 +185,7 @@ Item {
QGCLabel { QGCLabel {
anchors.baseline: offboardCombo.baseline anchors.baseline: offboardCombo.baseline
text: "Offboard switch:" text: "Offboard switch:"
color: fact.value == 0 ? qgcPal.text : (controller.rcChannelValues[fact.value - 1] >= 1500 ? "yellow" : qgcPal.text) color: parent.fact.value == 0 ? qgcPal.text : (controller.rcChannelValues[parent.fact.value - 1] >= 1500 ? "yellow" : qgcPal.text)
} }
FactComboBox { FactComboBox {
......
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