From 59498964c9f8fbbc5cae36df1c552db61017fdf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Mon, 5 Oct 2020 11:48:10 +0200 Subject: [PATCH] =?UTF-8?q?EGLFS:=20Don=E2=80=99t=20compute=20logical=20DP?= =?UTF-8?q?I=20from=20physical=20size?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove code which computes logical DPI from the screen’s physical size. Return a DPI of 100 instead (this value was previously returned if the physical size was not available), and add a matching logicalBaseDpi() implementation which gives a device pixel ratio of 1. Task-number: QTBUG-87035 Change-Id: Ib20afbbd24fd6b57c8ffb2fd697f1becba283cba Reviewed-by: Tor Arne Vestbø Reviewed-by: Laszlo Agocs --- .../platforms/eglfs/api/qeglfsdeviceintegration.cpp | 12 +++++------- .../platforms/eglfs/api/qeglfsdeviceintegration_p.h | 1 + src/plugins/platforms/eglfs/api/qeglfsscreen.cpp | 5 +++++ src/plugins/platforms/eglfs/api/qeglfsscreen_p.h | 1 + .../eglfs_emu/qeglfsemulatorscreen.cpp | 12 +++++------- .../eglfs_emu/qeglfsemulatorscreen.h | 1 + .../eglfs_kms_support/qeglfskmsscreen.cpp | 12 +++++------- .../eglfs_kms_support/qeglfskmsscreen.h | 1 + 8 files changed, 24 insertions(+), 21 deletions(-) diff --git a/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp b/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp index c406e79a1b6..3ef30f1fa94 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp +++ b/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp @@ -224,14 +224,12 @@ QSize QEglFSDeviceIntegration::screenSize() const QDpi QEglFSDeviceIntegration::logicalDpi() const { - const QSizeF ps = physicalScreenSize(); - const QSize s = screenSize(); + return QDpi(100, 100); +} - if (!ps.isEmpty() && !s.isEmpty()) - return QDpi(25.4 * s.width() / ps.width(), - 25.4 * s.height() / ps.height()); - else - return QDpi(100, 100); +QDpi QEglFSDeviceIntegration::logicalBaseDpi() const +{ + return QDpi(100, 100); } Qt::ScreenOrientation QEglFSDeviceIntegration::nativeOrientation() const diff --git a/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration_p.h b/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration_p.h index c544119587b..29efb75137d 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration_p.h +++ b/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration_p.h @@ -80,6 +80,7 @@ public: virtual QSizeF physicalScreenSize() const; virtual QSize screenSize() const; virtual QDpi logicalDpi() const; + virtual QDpi logicalBaseDpi() const; virtual Qt::ScreenOrientation nativeOrientation() const; virtual Qt::ScreenOrientation orientation() const; virtual int screenDepth() const; diff --git a/src/plugins/platforms/eglfs/api/qeglfsscreen.cpp b/src/plugins/platforms/eglfs/api/qeglfsscreen.cpp index 062b3ace35a..0b133c55a72 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsscreen.cpp +++ b/src/plugins/platforms/eglfs/api/qeglfsscreen.cpp @@ -115,6 +115,11 @@ QDpi QEglFSScreen::logicalDpi() const return qt_egl_device_integration()->logicalDpi(); } +QDpi QEglFSScreen::logicalBaseDpi() const +{ + return qt_egl_device_integration()->logicalBaseDpi(); +} + Qt::ScreenOrientation QEglFSScreen::nativeOrientation() const { return qt_egl_device_integration()->nativeOrientation(); diff --git a/src/plugins/platforms/eglfs/api/qeglfsscreen_p.h b/src/plugins/platforms/eglfs/api/qeglfsscreen_p.h index 6d84274fcc5..c749beb3884 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsscreen_p.h +++ b/src/plugins/platforms/eglfs/api/qeglfsscreen_p.h @@ -74,6 +74,7 @@ public: QSizeF physicalSize() const override; QDpi logicalDpi() const override; + QDpi logicalBaseDpi() const override; Qt::ScreenOrientation nativeOrientation() const override; Qt::ScreenOrientation orientation() const override; diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/qeglfsemulatorscreen.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/qeglfsemulatorscreen.cpp index f6e1193927e..697d92a5ca5 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/qeglfsemulatorscreen.cpp +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/qeglfsemulatorscreen.cpp @@ -75,14 +75,12 @@ QSizeF QEglFSEmulatorScreen::physicalSize() const QDpi QEglFSEmulatorScreen::logicalDpi() const { - const QSizeF ps = m_physicalSize; - const QSize s = m_geometry.size(); + return logicalBaseDpi(); +} - if (!ps.isEmpty() && !s.isEmpty()) - return QDpi(25.4 * s.width() / ps.width(), - 25.4 * s.height() / ps.height()); - else - return QDpi(100, 100); +QDpi QEglFSEmulatorScreen::logicalBaseDpi() const +{ + return QDpi(100, 100); } qreal QEglFSEmulatorScreen::refreshRate() const diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/qeglfsemulatorscreen.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/qeglfsemulatorscreen.h index 66bcf381cfa..c1d92bf44dd 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/qeglfsemulatorscreen.h +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/qeglfsemulatorscreen.h @@ -58,6 +58,7 @@ public: QImage::Format format() const override; QSizeF physicalSize() const override; QDpi logicalDpi() const override; + QDpi logicalBaseDpi() const override; qreal refreshRate() const override; Qt::ScreenOrientation nativeOrientation() const override; Qt::ScreenOrientation orientation() const override; diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.cpp index 59d7ec104c9..ad8479d9ade 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.cpp +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.cpp @@ -160,14 +160,12 @@ QSizeF QEglFSKmsScreen::physicalSize() const QDpi QEglFSKmsScreen::logicalDpi() const { - const QSizeF ps = physicalSize(); - const QSize s = geometry().size(); + return logicalBaseDpi(); +} - if (!ps.isEmpty() && !s.isEmpty()) - return QDpi(25.4 * s.width() / ps.width(), - 25.4 * s.height() / ps.height()); - else - return QDpi(100, 100); +QDpi QEglFSKmsScreen::logicalBaseDpi() const +{ + return QDpi(100, 100); } Qt::ScreenOrientation QEglFSKmsScreen::nativeOrientation() const diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h index 103476bc54a..9f21a9e54b0 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h @@ -69,6 +69,7 @@ public: QSizeF physicalSize() const override; QDpi logicalDpi() const override; + QDpi logicalBaseDpi() const override; Qt::ScreenOrientation nativeOrientation() const override; Qt::ScreenOrientation orientation() const override;