From ff1da598b221b51ca0c53031a35b0fd55a366809 Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Sun, 27 Mar 2016 00:46:22 +0100 Subject: [PATCH] LP-29 add "opaque" property to PfdView --- ground/gcs/src/share/qml/PfdTerrain.qml | 1 + ground/gcs/src/share/qml/pfd/Info.qml | 4 ++-- ground/gcs/src/share/qml/pfd/PfdView.qml | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ground/gcs/src/share/qml/PfdTerrain.qml b/ground/gcs/src/share/qml/PfdTerrain.qml index c7804a560..8c92bbeae 100644 --- a/ground/gcs/src/share/qml/PfdTerrain.qml +++ b/ground/gcs/src/share/qml/PfdTerrain.qml @@ -22,5 +22,6 @@ import QtQuick 2.4 import "pfd" PfdView { + opaque: false worldFile: "PfdTerrainWorld.qml" } diff --git a/ground/gcs/src/share/qml/pfd/Info.qml b/ground/gcs/src/share/qml/pfd/Info.qml index 0224355d7..d95992d24 100644 --- a/ground/gcs/src/share/qml/pfd/Info.qml +++ b/ground/gcs/src/share/qml/pfd/Info.qml @@ -62,7 +62,7 @@ Item { sceneSize: info.sceneSize elementName: "info-bg" width: parent.width - opacity: pfdContext.terrainEnabled ? 0.3 : 1 + opacity: opaque ? 0.3 : 1 } // @@ -452,7 +452,7 @@ Item { x: Math.floor(scaledBounds.x * sceneItem.width) y: Math.floor(scaledBounds.y * sceneItem.height) - opacity: pfdContext.terrainEnabled ? 0.6 : 1 + opacity: opaque ? 0.6 : 1 states: State { name: "fading" diff --git a/ground/gcs/src/share/qml/pfd/PfdView.qml b/ground/gcs/src/share/qml/pfd/PfdView.qml index 0032a019a..3d60dffb5 100644 --- a/ground/gcs/src/share/qml/pfd/PfdView.qml +++ b/ground/gcs/src/share/qml/pfd/PfdView.qml @@ -23,7 +23,8 @@ Rectangle { color: "#515151" - property string worldFile: "PfdSimpleWorld.qml" + property string worldFile: "PfdSimpleWorld.qml" + property bool opaque: true SvgElementImage { id: background