From 5290027e3bab75f14fc0a2b7c206594d9cb91e76 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 3 Dec 2019 09:21:43 +0100 Subject: Emit QScreen::(availableG|g)eometryChanged() on logical DPI change MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When a change in logical DPI occurs due to the user changing the scaling factor, the screen size in device independent pixels may change due to High DPI choosing a different scale factor. Factor out the commonly used code into QScreenPrivate methods and use them from QGuiApplicationPrivate::processScreenLogicalDotsPerInchChange(). Pick-to: 5.15 Task-number: QTBUG-76902 Task-number: QTBUG-79248 Change-Id: I241a0f52d8236a65084d501fb4d8f9faeea89c0f Reviewed-by: Morten Johan Sørvig --- src/gui/kernel/qscreen.cpp | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 'src/gui/kernel/qscreen.cpp') diff --git a/src/gui/kernel/qscreen.cpp b/src/gui/kernel/qscreen.cpp index d5a4b7c027..df628fcc73 100644 --- a/src/gui/kernel/qscreen.cpp +++ b/src/gui/kernel/qscreen.cpp @@ -77,15 +77,33 @@ QScreen::QScreen(QPlatformScreen *screen) d->setPlatformScreen(screen); } +void QScreenPrivate::updateGeometriesWithSignals() +{ + const QRect oldGeometry = geometry; + const QRect oldAvailableGeometry = availableGeometry; + updateHighDpi(); + emitGeometryChangeSignals(oldGeometry != geometry, oldAvailableGeometry != availableGeometry); +} + +void QScreenPrivate::emitGeometryChangeSignals(bool geometryChanged, bool availableGeometryChanged) +{ + Q_Q(QScreen); + if (availableGeometryChanged) + emit q->availableGeometryChanged(availableGeometry); + + if (geometryChanged || availableGeometryChanged) { + const auto siblings = q->virtualSiblings(); + for (QScreen* sibling : siblings) + emit sibling->virtualGeometryChanged(sibling->virtualGeometry()); + } +} + void QScreenPrivate::setPlatformScreen(QPlatformScreen *screen) { Q_Q(QScreen); platformScreen = screen; platformScreen->d_func()->screen = q; orientation = platformScreen->orientation(); - geometry = platformScreen->deviceIndependentGeometry(); - availableGeometry = QHighDpi::fromNative(platformScreen->availableGeometry(), - QHighDpiScaling::factor(platformScreen), geometry.topLeft()); logicalDpi = QPlatformScreen::overrideDpi(platformScreen->logicalDpi()); -- cgit v1.2.3