Commit d935d5c1 authored by DonLakeFlyer's avatar DonLakeFlyer

Make compass more visible in Outdoor theme

parent a99d190a
......@@ -20,6 +20,7 @@ import QtGraphicalEffects 1.0
import QGroundControl 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Palette 1.0
Item {
id: root
......@@ -35,6 +36,8 @@ Item {
width: size
height: size
QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
Item {
id: instrument
anchors.fill: parent
......@@ -115,8 +118,8 @@ Item {
anchors.fill: parent
radius: width / 2
color: Qt.rgba(0,0,0,0)
border.color: "black"
border.width: 2
border.color: qgcPal.text
border.width: 1
}
QGCLabel {
......
......@@ -20,9 +20,12 @@ import QtGraphicalEffects 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Vehicle 1.0
import QGroundControl.Palette 1.0
Item {
id: root
id: root
width: size
height: size
property real size: _defaultSize
property var vehicle: null
......@@ -32,14 +35,15 @@ Item {
property int _fontSize: ScreenTools.defaultFontPointSize * _sizeRatio
property real _heading: vehicle ? vehicle.heading.rawValue : 0
width: size
height: size
QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
Rectangle {
id: borderRect
anchors.fill: parent
radius: width / 2
color: "black"
color: qgcPal.window
border.color: qgcPal.text
border.width: 1
}
Item {
......@@ -49,9 +53,9 @@ Item {
Image {
id: pointer
width: size * 0.65
source: vehicle ? vehicle.vehicleImageCompass : ""
mipmap: true
width: size * 0.65
sourceSize.width: width
fillMode: Image.PreserveAspectFit
anchors.centerIn: parent
......@@ -62,28 +66,30 @@ Item {
}
}
Image {
QGCColoredImage {
id: compassDial
source: "/qmlimages/compassInstrumentDial.svg"
mipmap: true
fillMode: Image.PreserveAspectFit
anchors.fill: parent
sourceSize.height: parent.height
color: qgcPal.text
}
Rectangle {
anchors.centerIn: parent
width: size * 0.35
height: size * 0.2
border.color: Qt.rgba(1,1,1,0.15)
color: Qt.rgba(0,0,0,0.65)
border.color: qgcPal.text
color: qgcPal.window
opacity: 0.65
QGCLabel {
text: _headingString3
font.family: vehicle ? ScreenTools.demiboldFontFamily : ScreenTools.normalFontFamily
font.pointSize: _fontSize < 8 ? 8 : _fontSize;
color: "white"
anchors.centerIn: parent
text: _headingString3
font.family: vehicle ? ScreenTools.demiboldFontFamily : ScreenTools.normalFontFamily
font.pointSize: _fontSize < 8 ? 8 : _fontSize;
color: qgcPal.text
anchors.centerIn: parent
property string _headingString: vehicle ? _heading.toFixed(0) : "OFF"
property string _headingString2: _headingString.length === 1 ? "0" + _headingString : _headingString
......
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