From 37bcff0d7da5cfe05e12cacd85e9c2e28b4d38ef Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Sat, 29 Jul 2017 11:29:46 -0700 Subject: [PATCH] New coloring for child indicators --- src/PlanView/SimpleItemMapVisual.qml | 1 + src/QmlControls/MissionItemIndexLabel.qml | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/PlanView/SimpleItemMapVisual.qml b/src/PlanView/SimpleItemMapVisual.qml index f78bcb46e..2677f6504 100644 --- a/src/PlanView/SimpleItemMapVisual.qml +++ b/src/PlanView/SimpleItemMapVisual.qml @@ -121,6 +121,7 @@ Item { z: 2 label: object.abbreviation.length === 0 ? object.sequenceNumber : object.abbreviation.charAt(0) checked: object.isCurrentItem + child: true specifiesCoordinate: false onClicked: _root.clicked(object.sequenceNumber) diff --git a/src/QmlControls/MissionItemIndexLabel.qml b/src/QmlControls/MissionItemIndexLabel.qml index 2b226e4be..1393a3599 100644 --- a/src/QmlControls/MissionItemIndexLabel.qml +++ b/src/QmlControls/MissionItemIndexLabel.qml @@ -12,11 +12,12 @@ Canvas { signal clicked - property string label ///< Label to show to the side of the index indicator - property int index: 0 ///< Index to show in the indicator, 0 will show single char label instead, -1 first char of label in indicator full label to the side + property string label ///< Label to show to the side of the index indicator + property int index: 0 ///< Index to show in the indicator, 0 will show single char label instead, -1 first char of label in indicator full label to the side property bool checked: false property bool small: false - property var color: checked ? "green" : qgcPal.mapButtonHighlight + property bool child: false + property var color: checked ? "green" : (child ? qgcPal.mapIndicatorChild : qgcPal.mapIndicator) property real anchorPointX: _height / 2 property real anchorPointY: _height / 2 property bool specifiesCoordinate: true -- 2.22.0