Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
qgroundcontrol
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Valentin Platzgummer
qgroundcontrol
Commits
8226db0f
Commit
8226db0f
authored
9 years ago
by
dogmaphobic
Browse files
Options
Downloads
Patches
Plain Diff
Reduce iOS default font size.
Tweak toolbar height for mobile.
parent
56494c6b
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/QmlControls/ScreenToolsController.cc
+10
-7
10 additions, 7 deletions
src/QmlControls/ScreenToolsController.cc
src/QmlControls/SubMenuButton.qml
+1
-1
1 addition, 1 deletion
src/QmlControls/SubMenuButton.qml
src/ui/MainWindow.qml
+1
-1
1 addition, 1 deletion
src/ui/MainWindow.qml
with
12 additions
and
9 deletions
src/QmlControls/ScreenToolsController.cc
+
10
−
7
View file @
8226db0f
...
...
@@ -29,11 +29,14 @@
#ifdef Q_OS_WIN
const
double
ScreenToolsController
::
_defaultFontPixelSizeRatio
=
1.0
;
#elif __
mobile
__
#elif __
android
__
const
double
ScreenToolsController
::
_defaultFontPixelSizeRatio
=
1.0
;
#elif __ios__
const
double
ScreenToolsController
::
_defaultFontPixelSizeRatio
=
0.8
;
#else
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
;
...
...
This diff is collapsed.
Click to expand it.
src/QmlControls/SubMenuButton.qml
+
1
−
1
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
{
...
...
This diff is collapsed.
Click to expand it.
src/ui/MainWindow.qml
+
1
−
1
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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment