Commit 1ba1841b authored by Lorenz Meier's avatar Lorenz Meier

Merge pull request #3068 from DonLakeFlyer/Tuning

PX4 Tuning: Fix many bugs
parents 368501b3 979951f0
...@@ -71,7 +71,7 @@ QGCView { ...@@ -71,7 +71,7 @@ QGCView {
QGCFlickable { QGCFlickable {
clip: true clip: true
anchors.fill: parent anchors.fill: parent
contentHeight: sliderRect.y + sliderRect.height contentHeight: sliderOuterColumn.y + sliderOuterColumn.height
flickableDirection: Flickable.VerticalFlick flickableDirection: Flickable.VerticalFlick
QGCLabel { QGCLabel {
...@@ -82,6 +82,7 @@ QGCView { ...@@ -82,6 +82,7 @@ QGCView {
Column { Column {
id: sliderOuterColumn
anchors.margins: _margins anchors.margins: _margins
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
...@@ -99,6 +100,8 @@ QGCView { ...@@ -99,6 +100,8 @@ QGCView {
height: sliderColumn.y + sliderColumn.height + _margins height: sliderColumn.y + sliderColumn.height + _margins
color: palette.windowShade color: palette.windowShade
property alias sliderValue: slider.value
Column { Column {
id: sliderColumn id: sliderColumn
anchors.margins: _margins anchors.margins: _margins
...@@ -106,8 +109,6 @@ QGCView { ...@@ -106,8 +109,6 @@ QGCView {
anchors.right: parent.right anchors.right: parent.right
anchors.top: sliderRect.top anchors.top: sliderRect.top
property alias sliderValue: slider.value
QGCLabel { QGCLabel {
text: title text: title
font.weight: Font.DemiBold font.weight: Font.DemiBold
...@@ -115,6 +116,9 @@ QGCView { ...@@ -115,6 +116,9 @@ QGCView {
QGCLabel { QGCLabel {
text: description text: description
anchors.left: parent.left
anchors.right: parent.right
wrapMode: Text.WordWrap
} }
Slider { Slider {
......
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