Commit d2cc64cc authored by Patrick José Pereira's avatar Patrick José Pereira

MissionItemStatus: Make waypointValuesDisplay with variable width

Signed-off-by: 's avatarPatrick José Pereira <patrickelectric@gmail.com>
parent b93d3944
...@@ -19,6 +19,7 @@ import QGroundControl.FactSystem 1.0 ...@@ -19,6 +19,7 @@ import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0 import QGroundControl.FactControls 1.0
Rectangle { Rectangle {
id: root
height: ScreenTools.defaultFontPixelHeight * 7 height: ScreenTools.defaultFontPixelHeight * 7
radius: ScreenTools.defaultFontPixelWidth * 0.5 radius: ScreenTools.defaultFontPixelWidth * 0.5
color: qgcPal.window color: qgcPal.window
...@@ -27,8 +28,14 @@ Rectangle { ...@@ -27,8 +28,14 @@ Rectangle {
property var missionItems ///< List of all available mission items property var missionItems ///< List of all available mission items
property real maxWidth: parent.width
readonly property real _margins: ScreenTools.defaultFontPixelWidth readonly property real _margins: ScreenTools.defaultFontPixelWidth
onMaxWidthChanged: {
var calcLength = (statusListView.count + 1)*statusListView.contentItem.children[0].width
root.width = root.maxWidth > calcLength ? calcLength : root.maxWidth
}
QGCPalette { id: qgcPal } QGCPalette { id: qgcPal }
QGCLabel { QGCLabel {
...@@ -56,6 +63,11 @@ Rectangle { ...@@ -56,6 +63,11 @@ Rectangle {
clip: true clip: true
currentIndex: _currentMissionIndex currentIndex: _currentMissionIndex
onCountChanged: {
var calcLength = (statusListView.count + 1)*statusListView.contentItem.children[0].width
root.width = root.maxWidth > calcLength ? calcLength : root.maxWidth
}
delegate: Item { delegate: Item {
height: statusListView.height height: statusListView.height
width: display ? (indicator.width + spacing) : 0 width: display ? (indicator.width + spacing) : 0
......
...@@ -640,7 +640,7 @@ QGCView { ...@@ -640,7 +640,7 @@ QGCView {
id: waypointValuesDisplay id: waypointValuesDisplay
anchors.margins: ScreenTools.defaultFontPixelWidth anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.left: parent.left anchors.left: parent.left
anchors.right: rightPanel.left 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.isShortScreen
......
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