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