zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #3528 from DonLakeFlyer/PX4FM 

PX4 Flight Mode: Fix label coloring
QGC4.4
Don Gagne 9 years ago committed by GitHub
parent
935e1ca929 2d4d880550
commit
13bf81aa0b
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml

6
src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml
Unescape View File

@ -147,7 +147,7 @@ Item { @@ -147,7 +147,7 @@ Item {
QGCLabel {
anchors.baseline: returnCombo.baseline
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 {
@ -166,7 +166,7 @@ Item { @@ -166,7 +166,7 @@ Item {
QGCLabel {
anchors.baseline: killCombo.baseline
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 {
@ -185,7 +185,7 @@ Item { @@ -185,7 +185,7 @@ Item {
QGCLabel {
anchors.baseline: offboardCombo.baseline
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 {

Write Preview
Loading…
Cancel
Save