Browse Source

apply selected color to InstrumentValueLabel text

QGC4.4
Jacob Dahl 2 years ago committed by Don Gagne
parent
commit
3840476213
  1. 5
      src/QmlControls/InstrumentValueLabel.qml

5
src/QmlControls/InstrumentValueLabel.qml

@ -28,6 +28,7 @@ ColumnLayout { @@ -28,6 +28,7 @@ ColumnLayout {
property var _rgFontSizeTightHeights: [ _tightDefaultFontHeight * _rgFontSizeRatios[0] + 2, _tightDefaultFontHeight * _rgFontSizeRatios[1] + 2, _tightDefaultFontHeight * _rgFontSizeRatios[2] + 2, _tightDefaultFontHeight * _rgFontSizeRatios[3] + 2 ]
property real _tightHeight: _rgFontSizeTightHeights[instrumentValueData.factValueGrid.fontSize]
property bool _iconVisible: instrumentValueData.rangeType === InstrumentValueData.IconSelectRange || instrumentValueData.icon
property var _color: instrumentValueData.isValidColor(instrumentValueData.currentColor) ? instrumentValueData.currentColor : qgcPal.text
QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
@ -40,7 +41,7 @@ ColumnLayout { @@ -40,7 +41,7 @@ ColumnLayout {
fillMode: Image.PreserveAspectFit
mipmap: true
smooth: true
color: instrumentValueData.isValidColor(instrumentValueData.currentColor) ? instrumentValueData.currentColor : qgcPal.text
color: _color
opacity: instrumentValueData.currentOpacity
visible: _iconVisible
@ -77,6 +78,8 @@ ColumnLayout { @@ -77,6 +78,8 @@ ColumnLayout {
height: _tightHeight
font.pointSize: ScreenTools.smallFontPointSize
text: instrumentValueData.text
color: _color
opacity: instrumentValueData.currentOpacity
visible: !_iconVisible
}
}

Loading…
Cancel
Save