Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
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
Administrator
linphone-desktop
Commits
e8804d60
Commit
e8804d60
authored
Jun 07, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(src/main): fix font size on mac os
parent
2a77b298
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
6 deletions
+15
-6
App.cpp
linphone-desktop/src/app/App.cpp
+2
-2
main.cpp
linphone-desktop/src/main.cpp
+13
-4
No files found.
linphone-desktop/src/app/App.cpp
View file @
e8804d60
...
@@ -206,9 +206,9 @@ void App::parseArgs () {
...
@@ -206,9 +206,9 @@ void App::parseArgs () {
mParser
.
addVersionOption
();
mParser
.
addVersionOption
();
mParser
.
addOptions
({
mParser
.
addOptions
({
{
"config"
,
tr
(
"commandLineOptionConfig"
),
tr
(
"commandLineOptionConfigArg"
)
},
{
"config"
,
tr
(
"commandLineOptionConfig"
),
tr
(
"commandLineOptionConfigArg"
)
},
#ifndef
__APPLE__
#ifndef
Q_OS_MACOS
{
"iconified"
,
tr
(
"commandLineOptionIconified"
)
},
{
"iconified"
,
tr
(
"commandLineOptionIconified"
)
},
#endif // ifndef
__APPLE__
#endif // ifndef
Q_OS_MACOS
{
"self-test"
,
tr
(
"commandLineOptionSelfTest"
)
},
{
"self-test"
,
tr
(
"commandLineOptionSelfTest"
)
},
{
{
"V"
,
"verbose"
},
tr
(
"commandLineOptionVerbose"
)
},
{
{
"V"
,
"verbose"
},
tr
(
"commandLineOptionVerbose"
)
},
{
{
"c"
,
"cmd"
},
tr
(
"commandLineOptionCmd"
),
tr
(
"commandLineOptionCmdArg"
)
}
{
{
"c"
,
"cmd"
},
tr
(
"commandLineOptionCmd"
),
tr
(
"commandLineOptionCmdArg"
)
}
...
...
linphone-desktop/src/main.cpp
View file @
e8804d60
...
@@ -22,6 +22,7 @@
...
@@ -22,6 +22,7 @@
#include <QDirIterator>
#include <QDirIterator>
#include <QFontDatabase>
#include <QFontDatabase>
#include <QScreen>
#include "app/App.hpp"
#include "app/App.hpp"
...
@@ -40,11 +41,11 @@ int main (int argc, char *argv[]) {
...
@@ -40,11 +41,11 @@ int main (int argc, char *argv[]) {
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
// Options to get a nice video render.
// Options to get a nice video render.
#ifdef
_WIN32
#ifdef
Q_OS_WIN
QCoreApplication
::
setAttribute
(
Qt
::
AA_UseOpenGLES
,
true
);
QCoreApplication
::
setAttribute
(
Qt
::
AA_UseOpenGLES
,
true
);
#else
#else
QCoreApplication
::
setAttribute
(
Qt
::
AA_UseDesktopOpenGL
,
true
);
QCoreApplication
::
setAttribute
(
Qt
::
AA_UseDesktopOpenGL
,
true
);
#endif // ifdef
_WIN32
#endif // ifdef
Q_OS_WIN
QCoreApplication
::
setAttribute
(
Qt
::
AA_ShareOpenGLContexts
,
true
);
QCoreApplication
::
setAttribute
(
Qt
::
AA_ShareOpenGLContexts
,
true
);
{
{
...
@@ -92,8 +93,16 @@ int main (int argc, char *argv[]) {
...
@@ -92,8 +93,16 @@ int main (int argc, char *argv[]) {
}
}
}
}
app
.
setFont
(
QFont
(
DEFAULT_FONT
));
{
qInfo
()
<<
QStringLiteral
(
"Main font:"
)
<<
app
.
font
();
QFont
font
(
DEFAULT_FONT
);
#ifdef Q_OS_MACOS
// 72 dpi on MacOs...
font
.
setPointSizeF
(
font
.
pointSize
()
*
96.0
/
72.0
);
#endif // ifdef Q_OS_MACOS
app
.
setFont
(
QFont
(
DEFAULT_FONT
));
}
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
// Init and run!
// Init and run!
...
...
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