summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qscreen_p.h
diff options
context:
space:
mode:
authorFushan Wen <qydwhotmail@gmail.com>2022-05-29 19:08:17 +0800
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-06-29 15:49:39 +0000
commitf628977bd38954739187f504990e8e9d8f81e9fe (patch)
tree7e7110c0a28f184153bd6512c06f67e3c527364d /src/gui/kernel/qscreen_p.h
parentd6e414bfb1ecb195dc0964a9783bca8f8dca1c8c (diff)
Drop call to setPlatformScreen in QHighDpiScaling::setScreenFactor
Drop call to setPlatformScreen since the only affected variables are logicalDpi and geometry. Replace setPlatformScreen with updateLogicalDpi which handles global scale factor changes in QScreen. Call updateGeometriesWithSignals() to check if there are any changes in geometry or availableGeometry, since the geometry or availableGeometry can also change when setting a scale factor. Move setPlatformScreen to QScreen ctor as the function is not used elsewhere. Change-Id: I7acf40bf0643e89a1d9177674d66dc503829f98f Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 7b2ae3faab15913e006ece25d785e6a8453dd27a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/gui/kernel/qscreen_p.h')
-rw-r--r--src/gui/kernel/qscreen_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qscreen_p.h b/src/gui/kernel/qscreen_p.h
index 1ba0c7c442..9d7ab504b2 100644
--- a/src/gui/kernel/qscreen_p.h
+++ b/src/gui/kernel/qscreen_p.h
@@ -28,12 +28,12 @@ class QScreenPrivate : public QObjectPrivate
{
Q_DECLARE_PUBLIC(QScreen)
public:
- void setPlatformScreen(QPlatformScreen *screen);
void updateHighDpi()
{
geometry = platformScreen->deviceIndependentGeometry();
availableGeometry = QHighDpi::fromNative(platformScreen->availableGeometry(), QHighDpiScaling::factor(platformScreen), geometry.topLeft());
}
+ void updateLogicalDpi();
void updatePrimaryOrientation();
void updateGeometriesWithSignals();