Skip to content

Q
qgroundcontrol
Commit 766d3950 authored by Don Gagne's avatar Don Gagne
Browse files
Options

parent ec7f7406
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 6 deletions
src/FlightDisplay/GuidedActionList.qml
View file @ 766d3950
...@@ -31,7 +31,10 @@ Rectangle { ...@@ -31,7 +31,10 @@ Rectangle {
property var altitudeSlider property var altitudeSlider
property alias model: actionRepeater.model property alias model: actionRepeater.model
property real _margins: Math.round(ScreenTools.defaultFontPixelHeight * 0.66) property real _margins: Math.round(ScreenTools.defaultFontPixelHeight * 0.66)
property real _actionWidth: ScreenTools.defaultFontPixelWidth * 25
property real _actionHorizSpacing: ScreenTools.defaultFontPixelHeight * 2
QGCPalette { id: qgcPal } QGCPalette { id: qgcPal }
...@@ -58,11 +61,11 @@ Rectangle { ...@@ -58,11 +61,11 @@ Rectangle {
Layout.minimumWidth: _width Layout.minimumWidth: _width
Layout.maximumWidth: _width Layout.maximumWidth: _width
property real _width: Math.min(_root.width * 0.8, actionRow.width) property real _width: Math.min((_actionWidth * 2) + _actionHorizSpacing, actionRow.width)
RowLayout { RowLayout {
id: actionRow id: actionRow
spacing: ScreenTools.defaultFontPixelHeight * 2 spacing: _actionHorizSpacing
Repeater { Repeater {
id: actionRepeater id: actionRepeater
...@@ -74,11 +77,11 @@ Rectangle { ...@@ -74,11 +77,11 @@ Rectangle {
QGCLabel { QGCLabel {
id: actionMessage id: actionMessage
text: modelData.text ? modelData.text : "" text: modelData.text
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
Layout.minimumWidth: _width Layout.minimumWidth: _actionWidth
Layout.maximumWidth: _width Layout.maximumWidth: _actionWidth
Layout.fillHeight: true Layout.fillHeight: true
property real _width: ScreenTools.defaultFontPixelWidth * 25 property real _width: ScreenTools.defaultFontPixelWidth * 25
......
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