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
3d841012
Commit
3d841012
authored
Sep 25, 2017
by
Don Gagne
Committed by
GitHub
Sep 25, 2017
Browse files
Merge pull request #5680 from HorusAeronaves/itemstatus
MissionItemStatus: Make waypointValuesDisplay with variable width
parents
4757b20c
d2cc64cc
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/PlanView/MissionItemStatus.qml
View file @
3d841012
...
...
@@ -19,6 +19,7 @@ import QGroundControl.FactSystem 1.0
import
QGroundControl
.
FactControls
1.0
Rectangle
{
id
:
root
height
:
ScreenTools
.
defaultFontPixelHeight
*
7
radius
:
ScreenTools
.
defaultFontPixelWidth
*
0.5
color
:
qgcPal
.
window
...
...
@@ -27,8 +28,14 @@ Rectangle {
property
var
missionItems
///< List of all available mission items
property
real
maxWidth
:
parent
.
width
readonly
property
real
_margins
:
ScreenTools
.
defaultFontPixelWidth
onMaxWidthChanged
:
{
var
calcLength
=
(
statusListView
.
count
+
1
)
*
statusListView
.
contentItem
.
children
[
0
].
width
root
.
width
=
root
.
maxWidth
>
calcLength
?
calcLength
:
root
.
maxWidth
}
QGCPalette
{
id
:
qgcPal
}
QGCLabel
{
...
...
@@ -56,6 +63,11 @@ Rectangle {
clip
:
true
currentIndex
:
_currentMissionIndex
onCountChanged
:
{
var
calcLength
=
(
statusListView
.
count
+
1
)
*
statusListView
.
contentItem
.
children
[
0
].
width
root
.
width
=
root
.
maxWidth
>
calcLength
?
calcLength
:
root
.
maxWidth
}
delegate
:
Item
{
height
:
statusListView
.
height
width
:
display
?
(
indicator
.
width
+
spacing
)
:
0
...
...
src/PlanView/PlanView.qml
View file @
3d841012
...
...
@@ -640,7 +640,7 @@ QGCView {
id
:
waypointValuesDisplay
anchors.margins
:
ScreenTools
.
defaultFontPixelWidth
anchors.left
:
parent
.
left
anchors.right
:
rightPanel
.
left
maxWidth
:
parent
.
width
-
rightPanel
.
width
-
x
anchors.bottom
:
parent
.
bottom
missionItems
:
_missionController
.
visualItems
visible
:
_editingLayer
===
_layerMission
&&
!
ScreenTools
.
isShortScreen
...
...
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