Skip to content

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

Flickable works, better real estate usage

parent fc853305
Show whitespace changes
Inline Side-by-side
Showing with 111 additions and 99 deletions
src/AutoPilotPlugins/APM/APMFlightModesComponent.qml
View file @ f4b237b7
......@@ -35,6 +35,8 @@ QGCView {
id: rootQGCView
viewPanel: panel
property real _margins: ScreenTools.defaultFontPixelHeight
QGCPalette { id: qgcPal; colorGroupEnabled: panel.enabled }
APMFlightModesComponentController {
......@@ -48,18 +50,22 @@ QGCView {
Flickable {
anchors.fill: parent
Column {
width: parent.width
spacing: ScreenTools.defaultFontPixelHeight
clip: true
boundsBehavior: Flickable.StopAtBounds
flickableDirection: Flickable.VerticalFlick
contentHeight: flightModeSettings.y + flightModeSettings.height
QGCLabel {
id: flightModeLabel
text: "Channel 5 Flight Mode Settings"
font.weight: Font.DemiBold
}
Rectangle {
width: parent.width
id: flightModeSettings
anchors.topMargin: _margins
anchors.top: flightModeLabel.bottom
width: flightModeColumn.width + (_margins * 2)
height: flightModeColumn.height + ScreenTools.defaultFontPixelHeight
color: qgcPal.windowShade
......@@ -67,7 +73,7 @@ QGCView {
id: flightModeColumn
anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.left: parent.left
anchors.right: parent.right
// anchors.right: parent.right
anchors.top: parent.top
spacing: ScreenTools.defaultFontPixelHeight
......@@ -104,12 +110,20 @@ QGCView {
} // Rectangle - Flight Modes
QGCLabel {
id: channelOptionsLabel
anchors.leftMargin: _margins
anchors.top: parent.top
anchors.left: flightModeSettings.right
text: "Channel Options"
font.weight: Font.DemiBold
}
Rectangle {
width: parent.width
id: channelOptionsSettings
anchors.topMargin: _margins
anchors.top: channelOptionsLabel.bottom
anchors.left: channelOptionsLabel.left
width: channelOptColumn.width + (_margins * 2)
height: channelOptColumn.height + ScreenTools.defaultFontPixelHeight
color: qgcPal.windowShade
......@@ -117,7 +131,6 @@ QGCView {
id: channelOptColumn
anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
spacing: ScreenTools.defaultFontPixelHeight
......@@ -147,7 +160,6 @@ QGCView {
} // Repeater -- Channel options
} // Column - Channel options
} // Rectangle - Channel options
} // Column
} // FLickable
} // QGCViewPanel
} // QGCView
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