From 587ea466254c4f21dfd941427241b59049c6ec79 Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Fri, 24 Mar 2017 04:39:03 -0400 Subject: [PATCH] Plan toolbar tweaks --- src/MissionEditor/PlanToolBar.qml | 10 +++++++++- src/ui/MainWindowInner.qml | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/MissionEditor/PlanToolBar.qml b/src/MissionEditor/PlanToolBar.qml index 7a6fa5abe..3105d80c4 100644 --- a/src/MissionEditor/PlanToolBar.qml +++ b/src/MissionEditor/PlanToolBar.qml @@ -17,7 +17,7 @@ Rectangle { anchors.right: parent.right anchors.top: parent.top z: toolBar.z + 1 - color: qgcPal.window + color: qgcPal.globalTheme === QGCPalette.Light ? Qt.rgba(1,1,1,0.8) : Qt.rgba(0,0,0,0.75) visible: false signal showFlyView @@ -56,6 +56,14 @@ Rectangle { QGCPalette { id: qgcPal } + //-- Eat mouse events, preventing them from reaching toolbar, which is underneath us. + MouseArea { + anchors.fill: parent + onWheel: { wheel.accepted = true; } + onPressed: { mouse.accepted = true; } + onReleased: { mouse.accepted = true; } + } + Row { anchors.top: parent.top anchors.bottom: parent.bottom diff --git a/src/ui/MainWindowInner.qml b/src/ui/MainWindowInner.qml index 73c132ba3..93e051f63 100644 --- a/src/ui/MainWindowInner.qml +++ b/src/ui/MainWindowInner.qml @@ -259,6 +259,7 @@ Item { anchors.left: parent.left anchors.right: parent.right anchors.top: parent.top + opacity: planToolBar.visible ? 0 : 1 z: QGroundControl.zOrderTopMost Component.onCompleted: ScreenTools.availableHeight = parent.height - toolBar.height -- 2.22.0