Unverified Commit 359a08f0 authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #6603 from DonLakeFlyer/MoreFixes

More fixes
parents e4dc651d 435d6d36
...@@ -152,8 +152,16 @@ Item { ...@@ -152,8 +152,16 @@ Item {
on__GuidedModeSupportedChanged: _outputState() on__GuidedModeSupportedChanged: _outputState()
on__PauseVehicleSupportedChanged: _outputState() on__PauseVehicleSupportedChanged: _outputState()
on_CurrentMissionIndexChanged: console.log("_currentMissionIndex", _currentMissionIndex) on_CurrentMissionIndexChanged: {
on_ResumeMissionIndexChanged: console.log("_resumeMissionIndex", _resumeMissionIndex) if (__debugGuidedStates) {
console.log("_currentMissionIndex", _currentMissionIndex)
}
}
on_ResumeMissionIndexChanged: {
if (__debugGuidedStates) {
console.log("_resumeMissionIndex", _resumeMissionIndex)
}
}
onShowResumeMissionChanged: { onShowResumeMissionChanged: {
if (__debugGuidedStates) { if (__debugGuidedStates) {
console.log("showResumeMission", showResumeMission) console.log("showResumeMission", showResumeMission)
......
...@@ -73,6 +73,7 @@ Rectangle { ...@@ -73,6 +73,7 @@ Rectangle {
visible: display visible: display
property real availableHeight: height - indicator.height property real availableHeight: height - indicator.height
property bool _coordValid: object.coordinate.isValid
property bool _terrainAvailable: !isNaN(object.terrainPercent) property bool _terrainAvailable: !isNaN(object.terrainPercent)
property real _terrainPercent: _terrainAvailable ? object.terrainPercent : 1 property real _terrainPercent: _terrainAvailable ? object.terrainPercent : 1
...@@ -85,6 +86,7 @@ Rectangle { ...@@ -85,6 +86,7 @@ Rectangle {
width: indicator.width width: indicator.width
height: _terrainAvailable ? Math.max(availableHeight * _terrainPercent, 1) : parent.height height: _terrainAvailable ? Math.max(availableHeight * _terrainPercent, 1) : parent.height
color: _terrainAvailable ? (_terrainPercent > object.altPercent ? "red": qgcPal.text) : "yellow" color: _terrainAvailable ? (_terrainPercent > object.altPercent ? "red": qgcPal.text) : "yellow"
visible: _coordValid
} }
MissionItemIndexLabel { MissionItemIndexLabel {
......
...@@ -162,8 +162,6 @@ Item { ...@@ -162,8 +162,6 @@ Item {
Loader { Loader {
id: panelLoader id: panelLoader
x: _dropMargin
y: _dropMargin
onHeightChanged: _calcPositions() onHeightChanged: _calcPositions()
onWidthChanged: _calcPositions() onWidthChanged: _calcPositions()
......
...@@ -109,7 +109,7 @@ Canvas { ...@@ -109,7 +109,7 @@ Canvas {
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
color: "white" color: "white"
font.pointSize: ScreenTools.defaultFontPointSize font.pointSize: ScreenTools.defaultFontPointSize
fontSizeMode: Text.HorizontalFit fontSizeMode: Text.Fit
text: _index text: _index
} }
} }
......
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