1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add DPI change tests

Browse Source 
We can expand the testing a bit bit verifying that also
created windows work as expected, and that QWindow DPR
is updated when Screen DPI is changed.

Change-Id: I082aac18b6b086c69c16681977b7eaa6c3e54ee0
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
This commit is contained in:
Morten Sørvig 2023-02-16 00:17:20 +01:00 committed by Jukka Jokiniva
parent 684d301983
commit a215e6650a
1 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
tests/auto/gui/kernel/qhighdpi/tst_qhighdpi.cpp
View File

@ -36,6 +36,7 @@ private slots:
void screenDpiAndDpr_data();
void screenDpiAndDpr();
void screenDpiChange();
void screenDpiChangeWithWindow();
void environment_QT_SCALE_FACTOR();
void environment_QT_SCREEN_SCALE_FACTORS_data();
void environment_QT_SCREEN_SCALE_FACTORS();
@ -238,6 +239,9 @@ void tst_QHighDpi::screenDpiAndDpr()
QWindow window(screen);
QCOMPARE(window.devicePixelRatio(), screen->devicePixelRatio());
window.setGeometry(QRect(screen->geometry().center(), QSize(10, 10)));
window.create();
QCOMPARE(window.devicePixelRatio(), screen->devicePixelRatio());
}
}
@ -264,12 +268,48 @@ void tst_QHighDpi::screenDpiChange()
for (QScreen *screen : app->screens()) {
QCOMPARE(screen->devicePixelRatio(), newDpi / standardBaseDpi);
QCOMPARE(screen->logicalDotsPerInch(), newDpi / screen->devicePixelRatio());
QWindow window(screen);
QCOMPARE(window.devicePixelRatio(), screen->devicePixelRatio());
window.create();
QCOMPARE(window.devicePixelRatio(), screen->devicePixelRatio());
}
QCOMPARE(app->devicePixelRatio(), newDpi / standardBaseDpi);
}
void tst_QHighDpi::screenDpiChangeWithWindow()
{
QList<qreal> dpiValues = { 96, 192, 288 };
std::unique_ptr<QGuiApplication> app(createStandardOffscreenApp(dpiValues));
// Create windows for screens
QList<QScreen *> screens = app->screens();
QList<QWindow *> windows;
for (int i = 0; i < screens.count(); ++i) {
QScreen *screen = screens[i];
QWindow *window = new QWindow();
windows.append(window);
window->setGeometry(QRect(screen->geometry().center(), QSize(10, 10)));
window->create();
QCOMPARE(window->devicePixelRatio(), dpiValues[i] / standardBaseDpi);
}
// Change screen DPI
QList<qreal> newDpiValues = { 288, 192, 96 };
QJsonValue config = offscreenConfiguration();
QCborMap map = QCborMap::fromJsonObject(config.toObject());
for (int i = 0; i < screens.count(); ++i) {
map[QLatin1String("screens")][i][QLatin1String("logicalDpi")] = newDpiValues[i];
}
setOffscreenConfiguration(map.toJsonObject());
// Verify that window DPR changes on Screen DPI change.
for (int i = 0; i < screens.count(); ++i) {
QWindow *window = windows[i];
QCOMPARE(window->devicePixelRatio(), newDpiValues[i] / standardBaseDpi);
}
}
void tst_QHighDpi::environment_QT_SCALE_FACTOR()
{
qreal factor = 3.1415;