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
6758047f
Commit
6758047f
authored
Feb 22, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix font sizing for small screens
parent
4ef84b3c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
17 deletions
+28
-17
FlightDisplayViewWidgets.qml
src/FlightDisplay/FlightDisplayViewWidgets.qml
+3
-3
ValuesWidget.qml
src/FlightMap/Widgets/ValuesWidget.qml
+24
-13
VehicleFact.json
src/Vehicle/VehicleFact.json
+1
-1
No files found.
src/FlightDisplay/FlightDisplayViewWidgets.qml
View file @
6758047f
...
...
@@ -92,7 +92,7 @@ Item {
//-- Instrument Panel
QGCInstrumentWidget
{
id
:
instrumentGadget
anchors.margins
:
ScreenTools
.
defaultFontPixelHeight
anchors.margins
:
ScreenTools
.
defaultFontPixelHeight
/
2
anchors.right
:
parent
.
right
anchors.verticalCenter
:
parent
.
verticalCenter
visible
:
!
QGroundControl
.
virtualTabletJoystick
...
...
@@ -106,12 +106,12 @@ Item {
isSatellite
:
_isSatellite
z
:
QGroundControl
.
zOrderWidgets
qgcView
:
parent
.
parent
.
qgcView
maxHeight
:
parent
.
height
-
(
ScreenTools
.
defaultFontPixelHeight
*
2
)
maxHeight
:
parent
.
height
-
(
anchors
.
margins
*
2
)
}
QGCInstrumentWidgetAlternate
{
id
:
instrumentGadgetAlternate
anchors.margins
:
ScreenTools
.
defaultFontPixelHeight
anchors.margins
:
ScreenTools
.
defaultFontPixelHeight
/
2
anchors.top
:
parent
.
top
anchors.right
:
parent
.
right
visible
:
QGroundControl
.
virtualTabletJoystick
...
...
src/FlightMap/Widgets/ValuesWidget.qml
View file @
6758047f
...
...
@@ -89,6 +89,7 @@ QGCFlickable {
width
:
parent
.
width
horizontalAlignment
:
Text
.
AlignHCenter
color
:
textColor
fontSizeMode
:
Text
.
HorizontalFit
text
:
fact
.
shortDescription
+
(
fact
.
units
?
"
(
"
+
fact
.
units
+
"
)
"
:
""
)
}
QGCLabel
{
...
...
@@ -96,6 +97,7 @@ QGCFlickable {
horizontalAlignment
:
Text
.
AlignHCenter
font.pixelSize
:
ScreenTools
.
largeFontPixelSize
*
(
largeValue
?
1.3
:
1.0
)
font.weight
:
largeValue
?
Font
.
ExtraBold
:
Font
.
Normal
fontSizeMode
:
Text
.
HorizontalFit
color
:
textColor
text
:
fact
.
valueString
}
...
...
@@ -125,6 +127,7 @@ QGCFlickable {
width
:
parent
.
width
horizontalAlignment
:
Text
.
AlignHCenter
font.pixelSize
:
ScreenTools
.
smallFontPixelSize
fontSizeMode
:
Text
.
HorizontalFit
color
:
textColor
text
:
fact
.
shortDescription
}
...
...
@@ -132,12 +135,14 @@ QGCFlickable {
width
:
parent
.
width
horizontalAlignment
:
Text
.
AlignHCenter
color
:
textColor
fontSizeMode
:
Text
.
HorizontalFit
text
:
fact
.
enumOrValueString
}
QGCLabel
{
width
:
parent
.
width
horizontalAlignment
:
Text
.
AlignHCenter
font.pixelSize
:
ScreenTools
.
smallFontPixelSize
fontSizeMode
:
Text
.
HorizontalFit
color
:
textColor
text
:
fact
.
units
}
...
...
@@ -151,21 +156,27 @@ QGCFlickable {
QGCViewDialog
{
id
:
_propertyPickerDialog
QGC
Label
{
id
:
_label
text
:
"
Select the values you want to display:
"
}
QGC
Flickable
{
anchors.fill
:
parent
contentHeight
:
_loader
.
y
+
_loader
.
height
flickableDirection
:
Flickable
.
VerticalFlick
Loader
{
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
anchors.topMargin
:
_margins
anchors.top
:
_label
.
bottom
anchors.bottom
:
parent
.
bottom
sourceComponent
:
factGroupList
QGCLabel
{
id
:
_label
text
:
"
Select the values you want to display:
"
}
property
var
factGroup
:
_activeVehicle
property
var
factGroupName
:
"
Vehicle
"
Loader
{
id
:
_loader
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
anchors.topMargin
:
_margins
anchors.top
:
_label
.
bottom
sourceComponent
:
factGroupList
property
var
factGroup
:
_activeVehicle
property
var
factGroupName
:
"
Vehicle
"
}
}
}
}
...
...
src/Vehicle/VehicleFact.json
View file @
6758047f
...
...
@@ -46,7 +46,7 @@
},
{
"name"
:
"altitudeRelative"
,
"shortDescription"
:
"Altitude
(home)
"
,
"shortDescription"
:
"Altitude
-rel
"
,
"type"
:
"double"
,
"decimalPlaces"
:
1
,
"units"
:
"m"
...
...
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