mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-11-23 09:47:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

Delegate GUI scaling work to Qt

Browse source 
Set Qt::AA_EnableHighDpiScaling application attribute when Qt 5.14.x or
newer is used. This fixes a lot of scaling issues on HiDPI displays.

Unfortunately, this flag must be set only before QApllication object
creation, so the only one place where it can be done is main().
This commit is contained in:
Nick Korotysh 2020-03-03 23:39:17 +03:00
parent b519ece18b
commit d49d7c1d82
No known key found for this signature in database
GPG key ID: 7D0D4117C97CCC46
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/app/main.cpp
View file

@ -133,6 +133,12 @@ int main(int argc, char *argv[])
// We must save it here because QApplication constructor may change it // We must save it here because QApplication constructor may change it
bool isOneArg = (argc == 2); bool isOneArg = (argc == 2);
#if !defined(DISABLE_GUI) && (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
// Attribute Qt::AA_EnableHighDpiScaling must be set before QCoreApplication is created
if (qgetenv("QT_ENABLE_HIGHDPI_SCALING").isEmpty() && qgetenv("QT_AUTO_SCREEN_SCALE_FACTOR").isEmpty())
Application::setAttribute(Qt::AA_EnableHighDpiScaling, true);
#endif
try { try {
// Create Application // Create Application
const QString appId = QLatin1String("qBittorrent-") + Utils::Misc::getUserIDString(); const QString appId = QLatin1String("qBittorrent-") + Utils::Misc::getUserIDString();

5
src/gui/utils.cpp
View file

@ -62,6 +62,10 @@ void Utils::Gui::resize(QWidget *widget, const QSize &newSize)
qreal Utils::Gui::screenScalingFactor(const QWidget *widget) qreal Utils::Gui::screenScalingFactor(const QWidget *widget)
{ {
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
Q_UNUSED(widget);
return 1;
#else
if (!widget) if (!widget)
return 1; return 1;
@ -77,6 +81,7 @@ qreal Utils::Gui::screenScalingFactor(const QWidget *widget)
#else #else
return widget->devicePixelRatioF(); return widget->devicePixelRatioF();
#endif // Q_OS_WIN #endif // Q_OS_WIN
#endif // QT_VERSION
} }
QPixmap Utils::Gui::scaledPixmap(const QIcon &icon, const QWidget *widget, const int height) QPixmap Utils::Gui::scaledPixmap(const QIcon &icon, const QWidget *widget, const int height)