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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Valentin Platzgummer
qgroundcontrol
Commits
7709247e
Commit
7709247e
authored
9 years ago
by
Don Gagne
Browse files
Options
Downloads
Plain Diff
Merge pull request #1936 from DonLakeFlyer/ElCapitanHack
Limit font pixel size to work around OSX El Capitan problem
parents
c9f81c35
521c7a5c
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/QmlControls/ScreenTools.qml
+5
-2
5 additions, 2 deletions
src/QmlControls/ScreenTools.qml
with
5 additions
and
2 deletions
src/QmlControls/ScreenTools.qml
+
5
−
2
View file @
7709247e
...
...
@@ -12,8 +12,11 @@ Item {
readonly
property
real
defaultFontPixelHeight
:
defaultFontPixelSize
readonly
property
real
defaultFontPixelWidth
:
_textMeasure
.
fontWidth
readonly
property
real
smallFontPixelSize
:
defaultFontPixelSize
*
ScreenToolsController
.
smallFontPixelSizeRatio
readonly
property
real
mediumFontPixelSize
:
defaultFontPixelSize
*
ScreenToolsController
.
mediumFontPixelSizeRatio
readonly
property
real
largeFontPixelSize
:
defaultFontPixelSize
*
ScreenToolsController
.
largeFontPixelSizeRatio
// On OSX ElCapitan with Qt 5.4.0 any font pixel size above 19 shows garbage test. No idea why at this point.
// Will remove Math.min when problem is figure out.
readonly
property
real
mediumFontPixelSize
:
Math
.
min
(
defaultFontPixelSize
*
ScreenToolsController
.
mediumFontPixelSizeRatio
,
19
)
readonly
property
real
largeFontPixelSize
:
Math
.
min
(
defaultFontPixelSize
*
ScreenToolsController
.
largeFontPixelSizeRatio
,
19
)
property
bool
isAndroid
:
ScreenToolsController
.
isAndroid
property
bool
isiOS
:
ScreenToolsController
.
isiOS
...
...
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