From d313eefa99e4861d1a050c1e35f628c4aa1ae1cc Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Tue, 10 May 2016 12:52:10 +0200
Subject: [PATCH] Fix flight display: Make button positions stable, fix RTL
 text

---
 src/FlightDisplay/FlightDisplayViewWidgets.qml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/FlightDisplay/FlightDisplayViewWidgets.qml b/src/FlightDisplay/FlightDisplayViewWidgets.qml
index c7a69730b..422ff7e20 100644
--- a/src/FlightDisplay/FlightDisplayViewWidgets.qml
+++ b/src/FlightDisplay/FlightDisplayViewWidgets.qml
@@ -416,7 +416,7 @@ Item {
                 guidedModeConfirm.confirmText = qsTr("land")
                 break;
             case confirmHome:
-                guidedModeConfirm.confirmText = qsTr("return to launch")
+                guidedModeConfirm.confirmText = qsTr("return to land")
                 break;
             case confirmChangeAlt:
                 altitudeSlider.visible = true
@@ -441,6 +441,13 @@ Item {
             anchors.left:       parent.left
             spacing:            _margins
 
+            QGCLabel {
+                anchors.horizontalCenter: parent.horizontalCenter
+                color:      qgcPal.button
+                text:       "Click in map to move vehicle"
+                visible:    _activeVehicle && _activeVehicle.guidedMode && _activeVehicle.flying
+            }
+
             Row {
                 spacing: _margins
 
@@ -477,13 +484,6 @@ Item {
                     onClicked:  _guidedModeBar.confirmAction(_guidedModeBar.confirmChangeAlt)
                 }
             } // Row
-
-            QGCLabel {
-                anchors.horizontalCenter: parent.horizontalCenter
-                color:      qgcPal.button
-                text:       "Click in map to move vehicle"
-                visible:    _activeVehicle && _activeVehicle.guidedMode && _activeVehicle.flying
-            }
         } // Column
     } // Rectangle - Guided mode buttons
 
-- 
2.22.0