Skip to content

Q
qgroundcontrol
Unverified Commit 8ce76c39 authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #8029 from DonLakeFlyer/PX4SimpleFlightMode 

PX4 Flight Mode: Rework to use sizeToContents on combos for flight mode channels
parents ba32528d c6c32ba6
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 28 deletions
src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml
View file @ 8ce76c39
...@@ -81,52 +81,49 @@ Item { ...@@ -81,52 +81,49 @@ Item {
height: flightModeColumn.height + ScreenTools.defaultFontPixelHeight height: flightModeColumn.height + ScreenTools.defaultFontPixelHeight
color: qgcPal.windowShade color: qgcPal.windowShade
ColumnLayout { GridLayout {
id: flightModeColumn id: flightModeColumn
anchors.margins: ScreenTools.defaultFontPixelWidth anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.left: parent.left anchors.left: parent.left
anchors.top: parent.top anchors.top: parent.top
spacing: ScreenTools.defaultFontPixelHeight rows: 7
rowSpacing: ScreenTools.defaultFontPixelWidth / 2
columnSpacing: rowSpacing
flow: GridLayout.TopToBottom
RowLayout { QGCLabel {
Layout.fillWidth: true Layout.fillWidth: true
spacing: _margins text: qsTr("Mode Channel")
}
Repeater {
model: 6
QGCLabel { QGCLabel {
Layout.fillWidth: true Layout.fillWidth: true
text: qsTr("Mode channel:") text: qsTr("Flight Mode %1").arg(modelData + 1)
color: controller.activeFlightMode == index ? "yellow" : qgcPal.text
} }
}
FactComboBox { FactComboBox {
Layout.preferredWidth: _channelComboWidth Layout.fillWidth: true
fact: controller.getParameterFact(-1, "RC_MAP_FLTMODE") fact: controller.getParameterFact(-1, "RC_MAP_FLTMODE")
indexModel: false indexModel: false
} sizeToContents: true
} }
Repeater { Repeater {
model: 6 model: 6
RowLayout { FactComboBox {
Layout.fillWidth: true Layout.fillWidth: true
spacing: ScreenTools.defaultFontPixelWidth fact: controller.getParameterFact(-1, "COM_FLTMODE" + (modelData + 1))
indexModel: false
property int index: modelData + 1 sizeToContents: true
QGCLabel {
Layout.fillWidth: true
text: qsTr("Flight Mode %1").arg(index)
color: controller.activeFlightMode == index ? "yellow" : qgcPal.text
}
FactComboBox {
Layout.preferredWidth: _channelComboWidth
fact: controller.getParameterFact(-1, "COM_FLTMODE" + index)
indexModel: false
}
} }
} // Repeater - Flight Modes }
} // Column - Flight Modes }
} // Rectangle - Flight Modes } // Rectangle - Flight Modes
} // Column - Flight mode settings } // Column - Flight mode settings
......
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