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
2d5b2dbb
Commit
2d5b2dbb
authored
Jun 06, 2016
by
Don Gagne
Browse files
iOS uses 12 point for all devices
parent
9bef0830
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/QmlControls/ScreenTools.qml
View file @
2d5b2dbb
...
...
@@ -84,20 +84,20 @@ Item {
//-- Init base size base on the platform
if
(
ScreenToolsController
.
isMobile
)
{
//-- Check iOS really tiny screens (iPhone 4s/5/5s)
if
(
ScreenToolsController
.
isiOS
&&
Screen
.
width
<
570
)
baseSize
=
9
;
//-- iPhone 6/6s)
else
if
(
ScreenToolsController
.
isiOS
&&
Screen
.
width
<
670
)
baseSize
=
10
;
// Larger iOS (6/6s Plus or iPad)
else
if
(
ScreenToolsController
.
isiOS
)
baseSize
=
13
;
// Small Android Devices
else
if
((
Screen
.
width
/
Screen
.
pixelDensity
)
<
120
)
if
(
ScreenToolsController
.
isiOS
)
{
if
(
ScreenToolsController
.
isiOS
&&
Screen
.
width
<
570
)
{
// For iPhone 4s size we don't fit with additional tweaks to fit screen,
// we will just drop point size to make things fit. Correct size not yet determined.
baseSize
=
12
;
// This will be lowered in a future pull
}
else
{
baseSize
=
12
;
}
}
else
if
((
Screen
.
width
/
Screen
.
pixelDensity
)
<
120
)
{
baseSize
=
11
;
// Other Android
else
}
else
{
baseSize
=
14
;
}
}
else
{
//-- Mac OS
if
(
ScreenToolsController
.
isMacOS
)
...
...
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