From f84ba3108c06b50f31e2054bf23b0a8d20f41176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Wed, 30 Sep 2020 14:41:37 +0200 Subject: Remove QPlatformScreen::pixelDensity() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This function is no longer in use - Qt Gui now computes scale factors based on logicalDpi() and logicalBaseDpi() instead. Change-Id: Ieb4b75ef4e1563694a8e12b7cdd1f60c419d5bf2 Reviewed-by: Tor Arne Vestbø --- src/gui/kernel/qplatformscreen.cpp | 19 ------------------- src/gui/kernel/qplatformscreen.h | 1 - .../platforms/eglfs/api/qeglfsdeviceintegration.cpp | 5 ----- .../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 | 8 -------- .../eglfs_emu/qeglfsemulatorscreen.h | 2 -- 8 files changed, 42 deletions(-) diff --git a/src/gui/kernel/qplatformscreen.cpp b/src/gui/kernel/qplatformscreen.cpp index 0920f46975..f1fe942b9c 100644 --- a/src/gui/kernel/qplatformscreen.cpp +++ b/src/gui/kernel/qplatformscreen.cpp @@ -215,31 +215,12 @@ QDpi QPlatformScreen::logicalBaseDpi() const implementation returns 1.0. \sa QPlatformWindow::devicePixelRatio() - \sa QPlatformScreen::pixelDensity() */ qreal QPlatformScreen::devicePixelRatio() const { return 1.0; } -/*! - Reimplement this function in subclass to return the pixel density of the - screen. This is the scale factor needed to make a low-dpi application - usable on this screen. The default implementation returns 1.0. - - Returning something else than 1.0 from this function causes Qt to - apply the scale factor to the application's coordinate system. - This is different from devicePixelRatio, which reports a scale - factor already applied by the windowing system. A platform plugin - typically implements one (or none) of these two functions. - - \sa QPlatformWindow::devicePixelRatio() -*/ -qreal QPlatformScreen::pixelDensity() const -{ - return 1.0; -} - /*! Reimplement this function in subclass to return the vertical refresh rate of the screen, in Hz. diff --git a/src/gui/kernel/qplatformscreen.h b/src/gui/kernel/qplatformscreen.h index 68dab50ea5..048e785673 100644 --- a/src/gui/kernel/qplatformscreen.h +++ b/src/gui/kernel/qplatformscreen.h @@ -119,7 +119,6 @@ public: virtual QDpi logicalDpi() const; virtual QDpi logicalBaseDpi() const; virtual qreal devicePixelRatio() const; - virtual qreal pixelDensity() const; virtual qreal refreshRate() const; diff --git a/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp b/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp index 4b5a3c8c70..c406e79a1b 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp +++ b/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp @@ -234,11 +234,6 @@ QDpi QEglFSDeviceIntegration::logicalDpi() const return QDpi(100, 100); } -qreal QEglFSDeviceIntegration::pixelDensity() const -{ - return qMax(1, qRound(logicalDpi().first / qreal(100))); -} - Qt::ScreenOrientation QEglFSDeviceIntegration::nativeOrientation() const { return Qt::PrimaryOrientation; diff --git a/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration_p.h b/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration_p.h index 08447a40ea..c544119587 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration_p.h +++ b/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration_p.h @@ -80,7 +80,6 @@ public: virtual QSizeF physicalScreenSize() const; virtual QSize screenSize() const; virtual QDpi logicalDpi() const; - virtual qreal pixelDensity() 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 81f2e07f6b..062b3ace35 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsscreen.cpp +++ b/src/plugins/platforms/eglfs/api/qeglfsscreen.cpp @@ -115,11 +115,6 @@ QDpi QEglFSScreen::logicalDpi() const return qt_egl_device_integration()->logicalDpi(); } -qreal QEglFSScreen::pixelDensity() const -{ - return qt_egl_device_integration()->pixelDensity(); -} - 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 cf4a7afc33..6d84274fcc 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsscreen_p.h +++ b/src/plugins/platforms/eglfs/api/qeglfsscreen_p.h @@ -74,7 +74,6 @@ public: QSizeF physicalSize() const override; QDpi logicalDpi() const override; - qreal pixelDensity() 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 7654034f85..f6e1193927 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/qeglfsemulatorscreen.cpp +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/qeglfsemulatorscreen.cpp @@ -85,11 +85,6 @@ QDpi QEglFSEmulatorScreen::logicalDpi() const return QDpi(100, 100); } -qreal QEglFSEmulatorScreen::pixelDensity() const -{ - return m_pixelDensity; -} - qreal QEglFSEmulatorScreen::refreshRate() const { return m_refreshRate; @@ -163,9 +158,6 @@ void QEglFSEmulatorScreen::initFromJsonObject(const QJsonObject &description) m_physicalSize.setHeight(value.toInt()); } - value = description.value(QLatin1String("pixelDensity")); - if (!value.isUndefined() && value.isDouble()) - m_pixelDensity = value.toDouble(); value = description.value(QLatin1String("refreshRate")); if (!value.isUndefined() && value.isDouble()) diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/qeglfsemulatorscreen.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/qeglfsemulatorscreen.h index c4994720fa..66bcf381cf 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/qeglfsemulatorscreen.h +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/qeglfsemulatorscreen.h @@ -58,7 +58,6 @@ public: QImage::Format format() const override; QSizeF physicalSize() const override; QDpi logicalDpi() const override; - qreal pixelDensity() const override; qreal refreshRate() const override; Qt::ScreenOrientation nativeOrientation() const override; Qt::ScreenOrientation orientation() const override; @@ -74,7 +73,6 @@ private: int m_depth; QImage::Format m_format; QSizeF m_physicalSize; - float m_pixelDensity; float m_refreshRate; Qt::ScreenOrientation m_nativeOrientation; Qt::ScreenOrientation m_orientation; -- cgit v1.2.3