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

Revert "xcb: round down the scale factor for values < 0.8"

Browse Source 
This reverts commit 23b139038a1dc9a769a358ab112453abcdd39290.

The commit causes a regression on Ubuntu where the DPI setting of
the display is ignored.

Task-number: QTBUG-68620
Change-Id: Id176f8cda0daef1755abb3aa9382476cc4ed7d71
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
This commit is contained in:
Mitch Curtis 2018-06-07 12:21:23 +02:00 committed by Jani Heikkinen
parent de4eb79c2b
commit 89f9a3db15
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/platforms/xcb/qxcbscreen.cpp
View File

@ -750,12 +750,7 @@ void QXcbScreen::updateGeometry(const QRect &geometry, uint8_t rotation)
m_sizeMillimeters = sizeInMillimeters(geometry.size(), virtualDpi()); m_sizeMillimeters = sizeInMillimeters(geometry.size(), virtualDpi());
qreal dpi = geometry.width() / physicalSize().width() * qreal(25.4); qreal dpi = geometry.width() / physicalSize().width() * qreal(25.4);
qreal rawFactor = dpi/96; m_pixelDensity = qMax(1, qRound(dpi/96));
int roundedFactor = qFloor(rawFactor);
// Round up for .8 and higher. This favors "small UI" over "large UI".
if (rawFactor - roundedFactor >= 0.8)
roundedFactor = qCeil(rawFactor);
m_pixelDensity = qMax(1, roundedFactor);
m_geometry = geometry; m_geometry = geometry;
m_availableGeometry = geometry & m_virtualDesktop->workArea(); m_availableGeometry = geometry & m_virtualDesktop->workArea();
QWindowSystemInterface::handleScreenGeometryChange(QPlatformScreen::screen(), m_geometry, m_availableGeometry); QWindowSystemInterface::handleScreenGeometryChange(QPlatformScreen::screen(), m_geometry, m_availableGeometry);