From 1f7c77a181ba27b893418ae65c74a9dc869056ba Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Sun, 30 Jun 2019 15:08:56 -0300 Subject: [PATCH] Make guided altitude slider zero-based when vehicle is on the ground (positive values only). --- src/FlightDisplay/GuidedAltitudeSlider.qml | 5 +++-- src/QmlControls/QGCSlider.qml | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/FlightDisplay/GuidedAltitudeSlider.qml b/src/FlightDisplay/GuidedAltitudeSlider.qml index 4dcbbf42e..b2aea4875 100644 --- a/src/FlightDisplay/GuidedAltitudeSlider.qml +++ b/src/FlightDisplay/GuidedAltitudeSlider.qml @@ -26,6 +26,7 @@ Rectangle { property bool _fixedWing: activeVehicle ? activeVehicle.fixedWing : false property real _sliderMaxAlt: _flyViewSettings ? _flyViewSettings.guidedMaximumAltitude.rawValue : 0 property real _sliderMinAlt: _flyViewSettings ? _flyViewSettings.guidedMinimumAltitude.rawValue : 0 + property bool _flying: activeVehicle ? activeVehicle.flying : false function reset() { altSlider.value = 0 @@ -89,14 +90,14 @@ Rectangle { anchors.left: parent.left anchors.right: parent.right orientation: Qt.Vertical - minimumValue: -1 + minimumValue: _flying ? -1 : 0 maximumValue: 1 zeroCentered: true rotation: 180 // We want slide up to be positive values transform: Rotation { - origin.x: altSlider.width / 2 + origin.x: altSlider.width / 2 origin.y: altSlider.height / 2 angle: 180 } diff --git a/src/QmlControls/QGCSlider.qml b/src/QmlControls/QGCSlider.qml index 5c0d427ab..e2e065d24 100644 --- a/src/QmlControls/QGCSlider.qml +++ b/src/QmlControls/QGCSlider.qml @@ -23,8 +23,6 @@ Slider { property bool zeroCentered: false property bool displayValue: false - QGCPalette { id: qgcPal; colorGroupEnabled: enabled } - style: SliderStyle { groove: Item { anchors.verticalCenter: parent.verticalCenter -- 2.22.0