anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git.lyx.org:lyx

Browse Source
This commit is contained in:
Juergen Spitzmueller 2021-03-02 08:36:42 +01:00
commit d49c4abb43
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/frontends/qt/GuiApplication.cpp
View File

@ -181,6 +181,10 @@ frontend::Application * createApplication(int & argc, char * argv[])
AllowSetForegroundWindow(ASFW_ANY); AllowSetForegroundWindow(ASFW_ANY);
#endif #endif
// Setup high DPI handling. This is a bit complicated, but will be default in Qt6.
// macOS does it by itself.
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && !defined(Q_OS_MAC)
#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
// Attribute Qt::AA_EnableHighDpiScaling must be set before QCoreApplication is created // Attribute Qt::AA_EnableHighDpiScaling must be set before QCoreApplication is created
if (getEnv("QT_ENABLE_HIGHDPI_SCALING").empty() if (getEnv("QT_ENABLE_HIGHDPI_SCALING").empty()
@ -192,6 +196,7 @@ frontend::Application * createApplication(int & argc, char * argv[])
// HighDPI scale factor policy must be set before QGuiApplication is created // HighDPI scale factor policy must be set before QGuiApplication is created
if (getEnv("QT_SCALE_FACTOR_ROUNDING_POLICY").empty()) if (getEnv("QT_SCALE_FACTOR_ROUNDING_POLICY").empty())
QApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough); QApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
#endif
#endif #endif
frontend::GuiApplication * guiApp = new frontend::GuiApplication(argc, argv); frontend::GuiApplication * guiApp = new frontend::GuiApplication(argc, argv);