Linux: disable high dpi scaling on incorrect EDID

If the screen dimensions that are reported by EDID are
unrealistically low disable high dpi scaling.

For this purposes we consider the EDID incorrect if screen is
reported as smaller than 10 cm in width.

Closes #153
This commit is contained in:
Floris Bos 2021-02-16 15:42:39 +01:00
parent 2261faabc5
commit 37cc9e8736

View file

@ -31,6 +31,35 @@ static void consoleMsgHandler(QtMsgType, const QMessageLogContext &, const QStri
} }
#endif #endif
/* Workarounds for systems on which correct EDID info is not available */
static inline void _handleDpi(int argc, char *argv[])
{
QGuiApplication tmp(argc, argv);
QScreen *primaryScreen = QGuiApplication::primaryScreen();
int w = primaryScreen->geometry().width();
int h = primaryScreen->geometry().height();
int w_mm = primaryScreen->physicalSize().width();
int h_mm = primaryScreen->physicalSize().height();
#ifdef QT_NO_WIDGETS
if (h > 720)
{
qputenv("QT_SCALE_FACTOR", QByteArray::number(h / 720.0, 'f', 2));
}
#else
qDebug() << "Displaying on:"
<< primaryScreen->manufacturer()
<< primaryScreen->model()
<< QString::number(w)+"x"+QString::number(h)
<< QString::number(w_mm)+" mm x "+QString::number(h_mm)+" mm";
if (w_mm < 100)
{
qDebug() << "Physical display dimensions seem unrealistically low. Disabling high DPI scaling";
QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling);
}
#endif
}
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
@ -38,16 +67,10 @@ int main(int argc, char *argv[])
// prefer ANGLE (DirectX) over desktop OpenGL // prefer ANGLE (DirectX) over desktop OpenGL
QCoreApplication::setAttribute(Qt::AA_UseOpenGLES); QCoreApplication::setAttribute(Qt::AA_UseOpenGLES);
#endif #endif
#ifdef Q_OS_LINUX
_handleDpi(argc, argv);
#endif
#ifdef QT_NO_WIDGETS #ifdef QT_NO_WIDGETS
{
QGuiApplication tmp(argc, argv);
int h = QGuiApplication::primaryScreen()->geometry().height();
if (h > 720)
{
qputenv("QT_SCALE_FACTOR", QByteArray::number(h / 720.0, 'f', 2));
}
}
QGuiApplication app(argc, argv); QGuiApplication app(argc, argv);
#else #else
QApplication app(argc, argv); QApplication app(argc, argv);