Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
e5af2eae
Commit
e5af2eae
authored
Mar 24, 2017
by
Gus Grubba
Committed by
GitHub
Mar 24, 2017
Browse files
Merge pull request #4842 from dogmaphobic/planToolbarTweaks
Plan toolbar tweaks
parents
a026d63f
587ea466
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/MissionEditor/PlanToolBar.qml
View file @
e5af2eae
...
...
@@ -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
...
...
src/ui/MainWindowInner.qml
View file @
e5af2eae
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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