diff --git a/src/FlightDisplay/FlightDisplayViewWidgets.qml b/src/FlightDisplay/FlightDisplayViewWidgets.qml index b5d534dc7357352b252bdbccebfc5b48604f9c9b..d2d9a9a5353538e91047edcbc7e60d1d5983bef5 100644 --- a/src/FlightDisplay/FlightDisplayViewWidgets.qml +++ b/src/FlightDisplay/FlightDisplayViewWidgets.qml @@ -76,20 +76,20 @@ Item { //-- Instrument Pannel QGCInstrumentWidget { - anchors.margins: ScreenTools.defaultFontPixelHeight - anchors.right: parent.right - anchors.bottom: parent.bottom - size: ScreenTools.defaultFontPixelSize * (9) - active: _activeVehicle != null - heading: _heading - rollAngle: _roll - pitchAngle: _pitch - altitude: _altitudeWGS84 - groundSpeed: _groundSpeed - airSpeed: _airSpeed - climbRate: _climbRate - isSatellite: _mainIsMap ? _flightMap ? _flightMap.isSatelliteMap : true : true - z: QGroundControl.zOrderWidgets + anchors.margins: ScreenTools.defaultFontPixelHeight + anchors.right: parent.right + anchors.verticalCenter: parent.verticalCenter + size: ScreenTools.defaultFontPixelSize * (9) + active: _activeVehicle != null + heading: _heading + rollAngle: _roll + pitchAngle: _pitch + altitude: _altitudeWGS84 + groundSpeed: _groundSpeed + airSpeed: _airSpeed + climbRate: _climbRate + isSatellite: _mainIsMap ? _flightMap ? _flightMap.isSatelliteMap : true : true + z: QGroundControl.zOrderWidgets } //-- Vertical Tool Buttons @@ -97,7 +97,7 @@ Item { id: toolColumn anchors.margins: ScreenTools.defaultFontPixelHeight anchors.left: parent.left - anchors.top: parent.top + anchors.verticalCenter: parent.verticalCenter spacing: ScreenTools.defaultFontPixelHeight //-- Map Center Control diff --git a/src/FlightMap/Widgets/QGCInstrumentWidget.qml b/src/FlightMap/Widgets/QGCInstrumentWidget.qml index 0789e3b221d307d0a5f771379581f6f558dd8889..869094f255a2a8abf3ad0143e5cc4be544eb972a 100644 --- a/src/FlightMap/Widgets/QGCInstrumentWidget.qml +++ b/src/FlightMap/Widgets/QGCInstrumentWidget.qml @@ -51,14 +51,14 @@ Item { //-- Instrument Pannel Rectangle { - id: instrumentPannel - height: instruments.height + ScreenTools.defaultFontPixelSize - width: root.size - radius: root.size / 2 - visible: _isVisible - color: isSatellite ? Qt.rgba(1,1,1,0.75) : Qt.rgba(0,0,0,0.75) - anchors.right: parent.right - anchors.bottom: parent.bottom + id: instrumentPannel + height: instruments.height + ScreenTools.defaultFontPixelSize + width: root.size + radius: root.size / 2 + visible: _isVisible + color: isSatellite ? Qt.rgba(1,1,1,0.75) : Qt.rgba(0,0,0,0.75) + anchors.right: parent.right + anchors.verticalCenter: parent.verticalCenter Column { id: instruments width: parent.width @@ -185,14 +185,14 @@ Item { //-- Show Instruments Rectangle { - id: openButton - anchors.right: parent.right - anchors.bottom: parent.bottom - height: ScreenTools.defaultFontPixelSize * 2 - width: ScreenTools.defaultFontPixelSize * 2 - radius: ScreenTools.defaultFontPixelSize / 3 - visible: !_isVisible - color: isSatellite ? Qt.rgba(1,1,1,0.5) : Qt.rgba(0,0,0,0.5) + id: openButton + anchors.right: parent.right + anchors.verticalCenter: parent.verticalCenter + height: ScreenTools.defaultFontPixelSize * 2 + width: ScreenTools.defaultFontPixelSize * 2 + radius: ScreenTools.defaultFontPixelSize / 3 + visible: !_isVisible + color: isSatellite ? Qt.rgba(1,1,1,0.5) : Qt.rgba(0,0,0,0.5) Image { width: parent.width * 0.75 height: parent.height * 0.75