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
8226db0f
Commit
8226db0f
authored
Nov 10, 2015
by
dogmaphobic
Browse files
Reduce iOS default font size.
Tweak toolbar height for mobile.
parent
56494c6b
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/QmlControls/ScreenToolsController.cc
View file @
8226db0f
...
...
@@ -28,15 +28,18 @@
#include
"MainWindow.h"
#ifdef Q_OS_WIN
const
double
ScreenToolsController
::
_defaultFontPixelSizeRatio
=
1.0
;
#elif __mobile__
const
double
ScreenToolsController
::
_defaultFontPixelSizeRatio
=
1.0
;
const
double
ScreenToolsController
::
_defaultFontPixelSizeRatio
=
1.0
;
#elif __android__
const
double
ScreenToolsController
::
_defaultFontPixelSizeRatio
=
1.0
;
#elif __ios__
const
double
ScreenToolsController
::
_defaultFontPixelSizeRatio
=
0.8
;
#else
const
double
ScreenToolsController
::
_defaultFontPixelSizeRatio
=
0.8
;
const
double
ScreenToolsController
::
_defaultFontPixelSizeRatio
=
0.8
;
#endif
const
double
ScreenToolsController
::
_smallFontPixelSizeRatio
=
0.75
;
const
double
ScreenToolsController
::
_mediumFontPixelSizeRatio
=
1.22
;
const
double
ScreenToolsController
::
_largeFontPixelSizeRatio
=
1.66
;
const
double
ScreenToolsController
::
_smallFontPixelSizeRatio
=
0.75
;
const
double
ScreenToolsController
::
_mediumFontPixelSizeRatio
=
1.22
;
const
double
ScreenToolsController
::
_largeFontPixelSizeRatio
=
1.66
;
ScreenToolsController
::
ScreenToolsController
()
{
...
...
src/QmlControls/SubMenuButton.qml
View file @
8226db0f
...
...
@@ -39,7 +39,7 @@ Button {
verticalAlignment
:
TextEdit
.
AlignVCenter
horizontalAlignment
:
TextEdit
.
AlignHCenter
color
:
showHighlight
?
qgcPal
.
buttonHighlightText
:
qgcPal
.
buttonText
font.pixelSize
:
ScreenTools
.
isMobile
?
ScreenTools
.
defaultFontPixelSize
*
0.
6
5
:
ScreenTools
.
defaultFontPixelSize
font.pixelSize
:
ScreenTools
.
isMobile
?
ScreenTools
.
defaultFontPixelSize
*
0.
7
5
:
ScreenTools
.
defaultFontPixelSize
text
:
control
.
text
Rectangle
{
...
...
src/ui/MainWindow.qml
View file @
8226db0f
...
...
@@ -40,7 +40,7 @@ Item {
QGCPalette
{
id
:
__qgcPal
;
colorGroupEnabled
:
true
}
property
real
tbHeight
:
ScreenTools
.
isMobile
?
(
ScreenTools
.
isTinyScreen
?
(
mainWindow
.
width
*
0.0666
)
:
(
mainWindow
.
width
*
0.0
444
))
:
ScreenTools
.
defaultFontPixelSize
*
4
property
real
tbHeight
:
ScreenTools
.
isMobile
?
(
ScreenTools
.
isTinyScreen
?
(
mainWindow
.
width
*
0.0666
)
:
(
mainWindow
.
width
*
0.0
5
))
:
ScreenTools
.
defaultFontPixelSize
*
4
property
int
tbCellHeight
:
tbHeight
*
0.75
property
real
tbSpacing
:
ScreenTools
.
isMobile
?
width
*
0.00824
:
9.54
property
real
tbButtonWidth
:
tbCellHeight
*
1.3
...
...
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