From e4a5b8d352e82bae6b02c23a1c1fb54a40667520 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Mon, 20 Mar 2017 14:11:49 +0800 Subject: [PATCH] Setup DPI at startup --- src/app/main.cpp | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/src/app/main.cpp b/src/app/main.cpp index e5bfbfdaa..7a40680bf 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -40,6 +40,7 @@ #include #include #include + #ifdef QBT_STATIC_QT #include #ifdef QBT_USES_QT5 @@ -120,15 +121,20 @@ struct QBtCommandLineParameters } }; -#ifndef DISABLE_GUI -void showSplashScreen(); -#endif void displayVersion(); void displayUsage(const QString &prg_name); bool userAgreesWithLegalNotice(); void displayBadArgMessage(const QString &message); QBtCommandLineParameters parseCommandLine(); +#if !defined(DISABLE_GUI) +void showSplashScreen(); + +#if defined(Q_OS_UNIX) +void setupDpi(); +#endif // Q_OS_UNIX +#endif // DISABLE_GUI + // Main int main(int argc, char *argv[]) { @@ -141,6 +147,11 @@ int main(int argc, char *argv[]) macMigratePlists(); #endif +#if !defined(DISABLE_GUI) && defined(Q_OS_UNIX) + setupDpi(); +#endif + + #ifndef DISABLE_GUI migrateRSS(); #endif @@ -379,7 +390,7 @@ void sigAbnormalHandler(int signum) } #endif // defined(Q_OS_UNIX) || defined(STACKTRACE_WIN) -#ifndef DISABLE_GUI +#if !defined(DISABLE_GUI) void showSplashScreen() { QPixmap splash_img(":/icons/skin/splash.png"); @@ -393,7 +404,15 @@ void showSplashScreen() QTimer::singleShot(1500, splash, SLOT(deleteLater())); qApp->processEvents(); } -#endif + +#if defined(Q_OS_UNIX) +void setupDpi() +{ + if (qgetenv("QT_AUTO_SCREEN_SCALE_FACTOR").isEmpty()) + qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1"); +} +#endif // Q_OS_UNIX +#endif // DISABLE_GUI void displayVersion() {