Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
a56eb54e
Unverified
Commit
a56eb54e
authored
Sep 25, 2018
by
Don Gagne
Committed by
GitHub
Sep 25, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6884 from DonLakeFlyer/DeadMouseArea
Prevent clicks going through top level items
parents
8d080e27
9a9f2049
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
1 deletion
+15
-1
QGCInstrumentWidgetAlternate.qml
src/FlightMap/Widgets/QGCInstrumentWidgetAlternate.qml
+10
-1
MainToolBar.qml
src/ui/toolbar/MainToolBar.qml
+5
-0
No files found.
src/FlightMap/Widgets/QGCInstrumentWidgetAlternate.qml
View file @
a56eb54e
...
...
@@ -17,7 +17,6 @@ import QGroundControl.FactSystem 1.0
import
QGroundControl
.
FlightMap
1.0
import
QGroundControl
.
Palette
1.0
/// Instrument panel shown when virtual thumbsticks are visible
Rectangle
{
id
:
root
width
:
getPreferredInstrumentWidth
()
...
...
@@ -40,6 +39,11 @@ Rectangle {
property
real
_availableValueHeight
:
maxHeight
-
(
root
.
height
+
_valuesItem
.
anchors
.
topMargin
)
property
var
_activeVehicle
:
QGroundControl
.
multiVehicleManager
.
activeVehicle
// Prevent all clicks from going through to lower layers
DeadMouseArea
{
anchors.fill
:
parent
}
QGCPalette
{
id
:
qgcPal
}
QGCAttitudeWidget
{
...
...
@@ -68,6 +72,11 @@ Rectangle {
height
:
_valuesWidget
.
height
visible
:
widgetRoot
.
showValues
// Prevent all clicks from going through to lower layers
DeadMouseArea
{
anchors.fill
:
parent
}
Rectangle
{
anchors.fill
:
_valuesWidget
color
:
qgcPal
.
window
...
...
src/ui/toolbar/MainToolBar.qml
View file @
a56eb54e
...
...
@@ -62,6 +62,11 @@ Rectangle {
flyButton
.
checked
=
true
}
// Prevent all clicks from going through to lower layers
DeadMouseArea
{
anchors.fill
:
parent
}
/// Bottom single pixel divider
Rectangle
{
anchors.left
:
parent
.
left
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment