From fdfb7f039a8aa9f128663280de2516e9e1baf732 Mon Sep 17 00:00:00 2001
From: Don Gagne <dongagne@outlook.com>
Date: Sat, 20 Apr 2019 10:16:12 -0700
Subject: [PATCH] Show extra unit in small font
---
src/QmlControls/QGCTextField.qml | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/QmlControls/QGCTextField.qml b/src/QmlControls/QGCTextField.qml
index 4e132f5e7c..317ffd8ffa 100644
--- a/src/QmlControls/QGCTextField.qml
+++ b/src/QmlControls/QGCTextField.qml
@@ -13,9 +13,10 @@ TextField {
activeFocusOnPress: true
antialiasing: true
- property bool showUnits: false
- property bool showHelp: false
- property string unitsLabel: ""
+ property bool showUnits: false
+ property bool showHelp: false
+ property string unitsLabel: ""
+ property string extraUnitsLabel: ""
signal helpClicked
@@ -89,7 +90,17 @@ TextField {
font.family: ScreenTools.normalFontFamily
antialiasing: true
color: control.textColor
- visible: control.showUnits
+ visible: control.showUnits && text !== ""
+ }
+
+ Text {
+ Layout.alignment: Qt.AlignVCenter
+ text: control.extraUnitsLabel
+ font.pointSize: ScreenTools.smallFontPointSize
+ font.family: ScreenTools.normalFontFamily
+ antialiasing: true
+ color: control.textColor
+ visible: control.showUnits && text !== ""
}
Rectangle {
--
GitLab