Unverified Commit 409c863a authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #5963 from DonLakeFlyer/MissionItemStatusHeight

Mission Item Status (Terrain/Alt): Hide based on amount of screen real estate
parents ac1a0067 5e925309
...@@ -20,7 +20,6 @@ import QGroundControl.FactControls 1.0 ...@@ -20,7 +20,6 @@ import QGroundControl.FactControls 1.0
Rectangle { Rectangle {
id: root id: root
height: ScreenTools.defaultFontPixelHeight * 7
radius: ScreenTools.defaultFontPixelWidth * 0.5 radius: ScreenTools.defaultFontPixelWidth * 0.5
color: qgcPal.window color: qgcPal.window
opacity: 0.80 opacity: 0.80
......
...@@ -14,6 +14,7 @@ import QtQuick.Dialogs 1.2 ...@@ -14,6 +14,7 @@ import QtQuick.Dialogs 1.2
import QtLocation 5.3 import QtLocation 5.3
import QtPositioning 5.3 import QtPositioning 5.3
import QtQuick.Layouts 1.2 import QtQuick.Layouts 1.2
import QtQuick.Window 2.2
import QGroundControl 1.0 import QGroundControl 1.0
import QGroundControl.FlightMap 1.0 import QGroundControl.FlightMap 1.0
...@@ -652,10 +653,11 @@ QGCView { ...@@ -652,10 +653,11 @@ QGCView {
id: waypointValuesDisplay id: waypointValuesDisplay
anchors.margins: ScreenTools.defaultFontPixelWidth anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.left: parent.left anchors.left: parent.left
height: ScreenTools.defaultFontPixelHeight * 7
maxWidth: parent.width - rightPanel.width - x maxWidth: parent.width - rightPanel.width - x
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
missionItems: _missionController.visualItems missionItems: _missionController.visualItems
visible: _editingLayer === _layerMission && !ScreenTools.isShortScreen visible: _editingLayer === _layerMission && (ScreenTools.isMobile ? height < Screen.height * 0.25 : true)
} }
} // QGCViewPanel } // QGCViewPanel
......
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