Merge pull request #9444 from Chocobo1/dpi

Fix GUI scaling issue on Linux
This commit is contained in:
Mike Tzou 2018-09-06 16:04:44 +08:00 committed by GitHub
commit 487ea36782
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -102,10 +102,6 @@ void displayBadArgMessage(const QString &message);
#if !defined(DISABLE_GUI) #if !defined(DISABLE_GUI)
void showSplashScreen(); void showSplashScreen();
#if defined(Q_OS_UNIX)
void setupDpi();
#endif // Q_OS_UNIX
#endif // DISABLE_GUI #endif // DISABLE_GUI
// Main // Main
@ -120,10 +116,6 @@ int main(int argc, char *argv[])
macMigratePlists(); macMigratePlists();
#endif #endif
#if !defined(DISABLE_GUI) && defined(Q_OS_UNIX)
setupDpi();
#endif
try { try {
// Create Application // Create Application
QString appId = QLatin1String("qBittorrent-") + Utils::Misc::getUserIDString(); QString appId = QLatin1String("qBittorrent-") + Utils::Misc::getUserIDString();
@ -330,14 +322,6 @@ void showSplashScreen()
QTimer::singleShot(1500, splash, &QObject::deleteLater); QTimer::singleShot(1500, splash, &QObject::deleteLater);
qApp->processEvents(); qApp->processEvents();
} }
#if defined(Q_OS_UNIX)
void setupDpi()
{
if (qEnvironmentVariableIsEmpty("QT_AUTO_SCREEN_SCALE_FACTOR"))
qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1");
}
#endif // Q_OS_UNIX
#endif // DISABLE_GUI #endif // DISABLE_GUI
void displayVersion() void displayVersion()