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
58d4ff15
Commit
58d4ff15
authored
9 years ago
by
Don Gagne
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1821 from DonLakeFlyer/MissionScroll
Add scrollbar to mission summary list
parents
6f295b67
2253402f
master
dev1
merge_branch_alt
original
phil
rc1
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
12 deletions
+37
-12
FlightMap.qml
src/FlightMap/FlightMap.qml
+37
-11
MissionItemSummary.qml
src/QmlControls/MissionItemSummary.qml
+0
-1
No files found.
src/FlightMap/FlightMap.qml
View file @
58d4ff15
...
@@ -374,22 +374,48 @@ Item {
...
@@ -374,22 +374,48 @@ Item {
*/
*/
}
}
/// Mission item list
// Mission item list
Row
{
ScrollView
{
anchors.margins
:
ScreenTools
.
defaultFontPixelWidth
id
:
missionItemScroll
anchors.left
:
parent
.
left
anchors.margins
:
ScreenTools
.
defaultFontPixelWidth
anchors.right
:
controlWidgets
.
left
anchors.left
:
parent
.
left
anchors.bottom
:
parent
.
bottom
anchors.right
:
controlWidgets
.
left
spacing
:
ScreenTools
.
defaultFontPixelWidth
anchors.bottom
:
parent
.
bottom
height
:
missionItemRow
.
height
+
_scrollBarHeightAdjust
verticalScrollBarPolicy
:
Qt
.
ScrollBarAlwaysOff
opacity
:
0.75
property
bool
_scrollBarShown
:
missionItemRow
.
width
>
missionItemScroll
.
width
property
real
_scrollBarHeightAdjust
:
_scrollBarShown
?
(
scrollBarHeight
.
height
-
scrollBarHeight
.
viewport
.
height
)
+
5
:
0
Repeater
{
Row
{
model
:
multiVehicleManager
.
activeVehicle
?
multiVehicleManager
.
activeVehicle
.
missionItems
:
0
id
:
missionItemRow
spacing
:
ScreenTools
.
defaultFontPixelWidth
MissionItemSummary
{
Repeater
{
missionItem
:
modelData
model
:
multiVehicleManager
.
activeVehicle
?
multiVehicleManager
.
activeVehicle
.
missionItems
:
0
MissionItemSummary
{
opacity
:
0.75
missionItem
:
modelData
}
}
}
}
}
}
}
// This is used to determine the height of a horizontal scroll bar
ScrollView
{
id
:
scrollBarHeight
x
:
10000
y
:
10000
width
:
100
height
:
100
Rectangle
{
height
:
50
width
:
200
}
}
/// Map control widgets
/// Map control widgets
Column
{
Column
{
...
...
This diff is collapsed.
Click to expand it.
src/QmlControls/MissionItemSummary.qml
View file @
58d4ff15
...
@@ -13,7 +13,6 @@ Rectangle {
...
@@ -13,7 +13,6 @@ Rectangle {
border.width
:
2
border.width
:
2
border.color
:
"
white
"
border.color
:
"
white
"
color
:
"
white
"
color
:
"
white
"
opacity
:
0.75
radius
:
ScreenTools
.
defaultFontPixelWidth
radius
:
ScreenTools
.
defaultFontPixelWidth
MissionItemIndexLabel
{
MissionItemIndexLabel
{
...
...
This diff is collapsed.
Click to expand it.
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