From 34a64c377187c93a32f5c105a69b5ccd6b9cc945 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20S=C3=B8rvig?= Date: Wed, 21 Jun 2023 14:48:49 +0200 Subject: [PATCH] QWizard: Support fractional DPR on Windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We were storing the DPR as int; change to qreal. Task-number: QTBUG-114175 Change-Id: I7dc7df82f584cddbbb3f690f1df74e7a30369ab2 Reviewed-by: Tor Arne Vestbø (cherry picked from commit c0e48ed645f68e714e982064540d710676a0738b) Reviewed-by: Qt Cherry-pick Bot --- src/widgets/dialogs/qwizard_win.cpp | 4 ++-- src/widgets/dialogs/qwizard_win_p.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/widgets/dialogs/qwizard_win.cpp b/src/widgets/dialogs/qwizard_win.cpp index 34708c3e8de..2c4f049e888 100644 --- a/src/widgets/dialogs/qwizard_win.cpp +++ b/src/widgets/dialogs/qwizard_win.cpp @@ -33,7 +33,7 @@ Q_DECLARE_METATYPE(QMargins) QT_BEGIN_NAMESPACE -int QVistaHelper::m_devicePixelRatio = 1; +qreal QVistaHelper::m_devicePixelRatio = 1.0; /****************************************************************************** ** QVistaBackButton @@ -82,7 +82,7 @@ void QVistaBackButton::paintEvent(QPaintEvent *) RECT clipRect; int xoffset = origin.x() + QWidget::mapToParent(r.topLeft()).x() - 1; int yoffset = origin.y() + QWidget::mapToParent(r.topLeft()).y() - 1; - const int dpr = devicePixelRatio(); + const qreal dpr = devicePixelRatio(); const QRect rDp = QRect(r.topLeft() * dpr, r.size() * dpr); const int xoffsetDp = xoffset * dpr; const int yoffsetDp = yoffset * dpr; diff --git a/src/widgets/dialogs/qwizard_win_p.h b/src/widgets/dialogs/qwizard_win_p.h index 45f26a1ebfb..ce0f7b85b33 100644 --- a/src/widgets/dialogs/qwizard_win_p.h +++ b/src/widgets/dialogs/qwizard_win_p.h @@ -110,7 +110,7 @@ private: int titleBarOffset; // Extra spacing above the text int iconSpacing; // Space between button and icon - static int m_devicePixelRatio; + static qreal m_devicePixelRatio; };