From: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Date: Tue, 11 Sep 2018 10:29:28 +0000 (+0100)
Subject: hidpi_scale_at_192
X-Git-Tag: archive/raspbian/5.11.1+dfsg-8+rpi1^2~14
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=678ce12681207dd4c83d57491cf9898dba656666;p=qtbase-opensource-src.git

hidpi_scale_at_192


Gbp-Pq: Name hidpi_scale_at_192.diff
---

diff --git a/src/plugins/platforms/xcb/qxcbscreen.cpp b/src/plugins/platforms/xcb/qxcbscreen.cpp
index df458e85d..e1bd8eb75 100644
--- a/src/plugins/platforms/xcb/qxcbscreen.cpp
+++ b/src/plugins/platforms/xcb/qxcbscreen.cpp
@@ -750,7 +750,12 @@ void QXcbScreen::updateGeometry(const QRect &geometry, uint8_t rotation)
         m_sizeMillimeters = sizeInMillimeters(geometry.size(), virtualDpi());
 
     qreal dpi = geometry.width() / physicalSize().width() * qreal(25.4);
-    m_pixelDensity = qMax(1, qRound(dpi/96));
+    qreal rawFactor = 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_availableGeometry = geometry & m_virtualDesktop->workArea();
     QWindowSystemInterface::handleScreenGeometryChange(QPlatformScreen::screen(), m_geometry, m_availableGeometry);