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