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
3860173a
Commit
3860173a
authored
May 05, 2016
by
dogmaphobic
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix sizing within MissionItemStatus
parent
779d9702
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
75 additions
and
71 deletions
+75
-71
MissionEditor.qml
src/MissionEditor/MissionEditor.qml
+1
-0
MissionItemStatus.qml
src/MissionEditor/MissionItemStatus.qml
+66
-63
MissionItemIndexLabel.qml
src/QmlControls/MissionItemIndexLabel.qml
+8
-8
No files found.
src/MissionEditor/MissionEditor.qml
View file @
3860173a
...
@@ -496,6 +496,7 @@ QGCView {
...
@@ -496,6 +496,7 @@ QGCView {
orientation
:
ListView
.
Vertical
orientation
:
ListView
.
Vertical
model
:
controller
.
visualItems
model
:
controller
.
visualItems
cacheBuffer
:
height
*
2
cacheBuffer
:
height
*
2
clip
:
true
delegate
:
MissionItemEditor
{
delegate
:
MissionItemEditor
{
missionItem
:
object
missionItem
:
object
...
...
src/MissionEditor/MissionItemStatus.qml
View file @
3860173a
...
@@ -35,8 +35,8 @@ Rectangle {
...
@@ -35,8 +35,8 @@ Rectangle {
property
real
expandedWidth
///< Width of control when expanded
property
real
expandedWidth
///< Width of control when expanded
width
:
_expanded
?
expandedWidth
:
_collapsedWidth
width
:
_expanded
?
expandedWidth
:
_collapsedWidth
height
:
valueGrid
.
height
+
_margins
height
:
valueGrid
.
height
+
(
_margins
*
2
)
radius
:
ScreenTools
.
defaultFontPixelWidth
radius
:
ScreenTools
.
defaultFontPixelWidth
*
0.5
color
:
qgcPal
.
window
color
:
qgcPal
.
window
opacity
:
0.80
opacity
:
0.80
clip
:
true
clip
:
true
...
@@ -63,13 +63,16 @@ Rectangle {
...
@@ -63,13 +63,16 @@ Rectangle {
onClicked
:
_expanded
=
!
_expanded
onClicked
:
_expanded
=
!
_expanded
}
}
Row
{
anchors.fill
:
parent
anchors.margins
:
_margins
spacing
:
_margins
Grid
{
Grid
{
id
:
valueGrid
id
:
valueGrid
anchors.margins
:
_margins
anchors.left
:
parent
.
left
anchors.top
:
parent
.
top
columns
:
2
columns
:
2
columnSpacing
:
_margins
columnSpacing
:
_margins
anchors.verticalCenter
:
parent
.
verticalCenter
QGCLabel
{
text
:
qsTr
(
"
Distance:
"
)
}
QGCLabel
{
text
:
qsTr
(
"
Distance:
"
)
}
QGCLabel
{
text
:
_distanceText
}
QGCLabel
{
text
:
_distanceText
}
...
@@ -87,17 +90,18 @@ Rectangle {
...
@@ -87,17 +90,18 @@ Rectangle {
QGCFlickable
{
QGCFlickable
{
anchors.leftMargin
:
_margins
anchors.leftMargin
:
_margins
anchors.rightMargin
:
_margins
anchors.rightMargin
:
_margins
anchors.left
:
valueGrid
.
right
anchors.right
:
parent
.
right
anchors.top
:
parent
.
top
anchors.top
:
parent
.
top
anchors.bottom
:
parent
.
bottom
anchors.bottom
:
parent
.
bottom
width
:
parent
.
width
-
valueGrid
.
width
-
(
_margins
*
2
)
contentWidth
:
graphRow
.
width
contentWidth
:
graphRow
.
width
visible
:
_expanded
clip
:
true
clip
:
true
Row
{
Row
{
id
:
graphRow
id
:
graphRow
anchors.top
:
parent
.
top
anchors.top
:
parent
.
top
anchors.bottom
:
parent
.
bottom
anchors.bottom
:
parent
.
bottom
//anchors.margins: ScreenTools.defaultFontPixelWidth * ScreenTools.smallFontPointRatio
spacing
:
ScreenTools
.
defaultFontPixelWidth
*
ScreenTools
.
smallFontPointRatio
spacing
:
ScreenTools
.
defaultFontPixelWidth
*
ScreenTools
.
smallFontPointRatio
Repeater
{
Repeater
{
...
@@ -105,12 +109,10 @@ Rectangle {
...
@@ -105,12 +109,10 @@ Rectangle {
Item
{
Item
{
height
:
graphRow
.
height
height
:
graphRow
.
height
width
:
ScreenTools
.
defaultFontPixelWidth
*
ScreenTools
.
smallFontPointRatio
*
2
width
:
indicator
.
width
visible
:
object
.
specifiesCoordinate
&&
!
object
.
isStandaloneCoordinate
visible
:
object
.
specifiesCoordinate
&&
!
object
.
isStandaloneCoordinate
property
real
availableHeight
:
height
-
indicator
.
height
property
real
availableHeight
:
height
-
(
ScreenTools
.
defaultFontPixelHeight
*
ScreenTools
.
smallFontPointRatio
)
-
indicator
.
height
property
bool
graphAbsolute
:
true
property
bool
graphAbsolute
:
true
MissionItemIndexLabel
{
MissionItemIndexLabel
{
...
@@ -136,4 +138,5 @@ Rectangle {
...
@@ -136,4 +138,5 @@ Rectangle {
}
}
}
}
}
}
}
}
}
src/QmlControls/MissionItemIndexLabel.qml
View file @
3860173a
...
@@ -19,22 +19,22 @@ Rectangle {
...
@@ -19,22 +19,22 @@ Rectangle {
border.color
:
"
white
"
border.color
:
"
white
"
color
:
isCurrentItem
?
"
green
"
:
qgcPal
.
mapButtonHighlight
color
:
isCurrentItem
?
"
green
"
:
qgcPal
.
mapButtonHighlight
property
real
_width
:
small
?
ScreenTools
.
smallFontPointSize
*
1.5
:
ScreenTools
.
mediumFontPointSize
*
1.
5
property
real
_width
:
small
?
ScreenTools
.
defaultFontPixelHeight
*
ScreenTools
.
smallFontPointRatio
*
1.75
:
ScreenTools
.
defaultFontPixelHeight
*
1.7
5
QGCPalette
{
id
:
qgcPal
}
QGCPalette
{
id
:
qgcPal
}
MouseArea
{
anchors.fill
:
parent
onClicked
:
parent
.
clicked
()
}
QGCLabel
{
QGCLabel
{
id
:
_label
id
:
_label
anchors.fill
:
parent
anchors.fill
:
parent
horizontalAlignment
:
Text
.
AlignHCenter
horizontalAlignment
:
Text
.
AlignHCenter
verticalAlignment
:
Text
.
AlignVCenter
verticalAlignment
:
Text
.
AlignVCenter
color
:
"
white
"
color
:
"
white
"
font.pointSize
:
small
?
ScreenTools
.
smallFontPointSize
:
ScreenTools
.
medium
FontPointSize
font.pointSize
:
small
?
ScreenTools
.
smallFontPointSize
:
ScreenTools
.
default
FontPointSize
}
}
MouseArea
{
anchors.fill
:
parent
onClicked
:
parent
.
clicked
()
}
}
}
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