Skip to content

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

Fix Flickable, better real estate usage

parent 9d708e08
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 20 deletions
src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml
View file @ fdf1c814
...@@ -40,7 +40,7 @@ QGCView { ...@@ -40,7 +40,7 @@ QGCView {
QGCPalette { id: palette; colorGroupEnabled: enabled } QGCPalette { id: palette; colorGroupEnabled: enabled }
property Fact _failsafeBattEnabled: controller.getParameterFact(-1, "FS_BATT_ENABLE") property Fact _failsafeBattEnable: controller.getParameterFact(-1, "FS_BATT_ENABLE")
property Fact _failsafeBattMah: controller.getParameterFact(-1, "FS_BATT_MAH") property Fact _failsafeBattMah: controller.getParameterFact(-1, "FS_BATT_MAH")
property Fact _failsafeBattVoltage: controller.getParameterFact(-1, "FS_BATT_VOLTAGE") property Fact _failsafeBattVoltage: controller.getParameterFact(-1, "FS_BATT_VOLTAGE")
property Fact _failsafeThrEnable: controller.getParameterFact(-1, "FS_THR_ENABLE") property Fact _failsafeThrEnable: controller.getParameterFact(-1, "FS_THR_ENABLE")
...@@ -72,6 +72,7 @@ QGCView { ...@@ -72,6 +72,7 @@ QGCView {
clip: true clip: true
anchors.fill: parent anchors.fill: parent
boundsBehavior: Flickable.StopAtBounds boundsBehavior: Flickable.StopAtBounds
contentHeight: rtlSettings.y + rtlSettings.height
flickableDirection: Flickable.VerticalFlick flickableDirection: Flickable.VerticalFlick
QGCLabel { QGCLabel {
...@@ -81,13 +82,14 @@ QGCView { ...@@ -81,13 +82,14 @@ QGCView {
} }
Rectangle { Rectangle {
id: failsafeSettings id: failsafeSettings
anchors.topMargin: _margins / 2 anchors.topMargin: _margins / 2
anchors.left: parent.left anchors.rightMargin: _margins
anchors.right: parent.right anchors.left: parent.left
anchors.top: failsafeLabel.bottom anchors.top: failsafeLabel.bottom
height: fenceAltMaxField.y + fenceAltMaxField.height + _margins width: throttleEnableCombo.x + throttleEnableCombo.x + _margins
color: palette.windowShade height: mahField.y + mahField.height + _margins
color: palette.windowShade
QGCLabel { QGCLabel {
id: throttleEnableLabel id: throttleEnableLabel
...@@ -141,9 +143,9 @@ QGCView { ...@@ -141,9 +143,9 @@ QGCView {
anchors.top: throttlePWMField.bottom anchors.top: throttlePWMField.bottom
width: voltageField.width width: voltageField.width
model: ["Disabled", "Land", "Return to Launch"] model: ["Disabled", "Land", "Return to Launch"]
currentIndex: _failsafeBattEnabled.value currentIndex: _failsafeBattEnable.value
onActivated: _failsafeBattEnabled.value = index onActivated: _failsafeBattEnable.value = index
} }
QGCCheckBox { QGCCheckBox {
...@@ -190,21 +192,20 @@ QGCView { ...@@ -190,21 +192,20 @@ QGCView {
QGCLabel { QGCLabel {
id: geoFenceLabel id: geoFenceLabel
anchors.topMargin: _margins anchors.leftMargin: _margins
anchors.left: parent.left anchors.left: failsafeSettings.right
anchors.right: parent.right anchors.top: parent.top
anchors.top: failsafeSettings.bottom text: "GeoFence"
text: "GeoFence" font.weight: Font.DemiBold
font.weight: Font.DemiBold
} }
Rectangle { Rectangle {
id: geoFenceSettings id: geoFenceSettings
anchors.topMargin: _margins / 2 anchors.topMargin: _margins / 2
anchors.left: parent.left anchors.left: geoFenceLabel.left
anchors.right: parent.right
anchors.top: geoFenceLabel.bottom anchors.top: geoFenceLabel.bottom
height: fenceAltMaxField.y + fenceAltMaxField.height + _margins anchors.bottom: failsafeSettings.bottom
width: fenceAltMaxField.x + fenceAltMaxField.width + _margins
color: palette.windowShade color: palette.windowShade
QGCCheckBox { QGCCheckBox {
...@@ -324,10 +325,11 @@ QGCView { ...@@ -324,10 +325,11 @@ QGCView {
} }
Rectangle { Rectangle {
id: rtlSettings
anchors.topMargin: _margins / 2 anchors.topMargin: _margins / 2
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right
anchors.top: rtlLabel.bottom anchors.top: rtlLabel.bottom
width: rltAltFinalField.x + rltAltFinalField.width + _margins
height: rltAltFinalField.y + rltAltFinalField.height + _margins height: rltAltFinalField.y + rltAltFinalField.height + _margins
color: palette.windowShade color: palette.windowShade
......
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