Skip to content

Q
qgroundcontrol
Commit ecc63cf1 authored by Don Gagne's avatar Don Gagne
Browse files
Options

Fix some control width problems

parent 0d7fd3ce
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml
View file @ ecc63cf1
...@@ -40,6 +40,9 @@ Item { ...@@ -40,6 +40,9 @@ Item {
property real _margins: ScreenTools.defaultFontPixelHeight / 2 property real _margins: ScreenTools.defaultFontPixelHeight / 2
readonly property real _flightModeComboWidth: ScreenTools.defaultFontPixelWidth * 23
readonly property real _channelComboWidth: ScreenTools.defaultFontPixelWidth * 20
QGCPalette { id: qgcPal; colorGroupEnabled: panel.enabled } QGCPalette { id: qgcPal; colorGroupEnabled: panel.enabled }
PX4SimpleFlightModesController { PX4SimpleFlightModesController {
...@@ -95,7 +98,7 @@ Item { ...@@ -95,7 +98,7 @@ Item {
FactComboBox { FactComboBox {
id: modeChannelCombo id: modeChannelCombo
width: ScreenTools.defaultFontPixelWidth * 15 width: _channelComboWidth
fact: controller.getParameterFact(-1, "RC_MAP_FLTMODE") fact: controller.getParameterFact(-1, "RC_MAP_FLTMODE")
indexModel: false indexModel: false
} }
...@@ -117,7 +120,7 @@ Item { ...@@ -117,7 +120,7 @@ Item {
FactComboBox { FactComboBox {
id: modeCombo id: modeCombo
width: ScreenTools.defaultFontPixelWidth * 20 width: _flightModeComboWidth
fact: controller.getParameterFact(-1, "COM_FLTMODE" + index) fact: controller.getParameterFact(-1, "COM_FLTMODE" + index)
indexModel: false indexModel: false
} }
...@@ -163,7 +166,7 @@ Item { ...@@ -163,7 +166,7 @@ Item {
FactComboBox { FactComboBox {
id: optCombo id: optCombo
width: ScreenTools.defaultFontPixelWidth * 15 width: _channelComboWidth
fact: parent.fact fact: parent.fact
indexModel: false indexModel: false
} }
......
src/ui/MainWindowLeftPanel.qml
View file @ ecc63cf1
...@@ -130,7 +130,7 @@ Item { ...@@ -130,7 +130,7 @@ Item {
// This is the menu dialog panel which is anchored to the left edge // This is the menu dialog panel which is anchored to the left edge
Rectangle { Rectangle {
id: __leftMenu id: __leftMenu
width: ScreenTools.defaultFontPixelWidth * 12 width: ScreenTools.defaultFontPixelWidth * 14
anchors.left: parent.left anchors.left: parent.left
anchors.top: __topSeparator.bottom anchors.top: __topSeparator.bottom
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
......
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