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
2d5b2dbb
Commit
2d5b2dbb
authored
Jun 06, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
iOS uses 12 point for all devices
parent
9bef0830
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
11 deletions
+11
-11
ScreenTools.qml
src/QmlControls/ScreenTools.qml
+11
-11
No files found.
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
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