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

Adjust screen scale factor for certain screen configurations

Browse Source 
Pixel density reported by the screen is sometimes not precise enough,
so recalculate it: divide px (physical pixels) by dp (device-independent pixels)
for both width and height, and then use the average if it is different
from the one initially reported by the screen

Task-number: QTBUG-62191
Change-Id: Ia2f485c7ce8849db6e7c1d2ac08f5e008aea2ff8
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
This commit is contained in:
Victor-Andrei Variu 2017-08-14 15:47:26 +03:00 committed by Morten Johan Sørvig
parent 12aa501752
commit b72b5cd760
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui/kernel/qhighdpiscaling.cpp
View File

@ -376,8 +376,22 @@ qreal QHighDpiScaling::screenSubfactor(const QPlatformScreen *screen)
{
qreal factor = qreal(1.0);
if (screen) {
if (m_usePixelDensity)
factor *= screen->pixelDensity();
if (m_usePixelDensity) {
qreal pixelDensity = screen->pixelDensity();
// Pixel density reported by the screen is sometimes not precise enough,
// so recalculate it: divide px (physical pixels) by dp (device-independent pixels)
// for both width and height, and then use the average if it is different from
// the one initially reported by the screen
QRect screenGeometry = screen->geometry();
qreal wFactor = qreal(screenGeometry.width()) / qRound(screenGeometry.width() / pixelDensity);
qreal hFactor = qreal(screenGeometry.height()) / qRound(screenGeometry.height() / pixelDensity);
qreal averageDensity = (wFactor + hFactor) / 2;
if (!qFuzzyCompare(pixelDensity, averageDensity))
pixelDensity = averageDensity;
factor *= pixelDensity;
}
if (m_screenFactorSet) {
QVariant screenFactor = screen->screen()->property(scaleFactorProperty);
if (screenFactor.isValid())