From 2d20406f5996e42dfb06c6c19ae28a92314929bf Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 12 Dec 2022 15:11:00 +0100 Subject: [PATCH] Vista Style: Use correct action icon pixmaps matching the device pixel ratio MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Extend change 5911335756dff5a917e4a7ccf025816c08ddd656 to the Vista style (using the paint device's ratio). Pick-to: 6.4 Fixes: QTBUG-108440 Task-number: QTBUG-85885 Change-Id: Ib0b5fcc943a18896b770b382b39bbb684238a618 Reviewed-by: Tor Arne Vestbø --- src/plugins/styles/windowsvista/qwindowsvistastyle.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp b/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp index 969e53b8e1..d14f021c0e 100644 --- a/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp +++ b/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp @@ -2949,11 +2949,10 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption QIcon::Mode mode = dis ? QIcon::Disabled : QIcon::Normal; if (act && !dis) mode = QIcon::Active; - QPixmap pixmap; - if (checked) - pixmap = menuitem->icon.pixmap(proxy()->pixelMetric(PM_SmallIconSize, option, widget), mode, QIcon::On); - else - pixmap = menuitem->icon.pixmap(proxy()->pixelMetric(PM_SmallIconSize, option, widget), mode); + const auto size = proxy()->pixelMetric(PM_SmallIconSize, option, widget); + const auto dpr = painter->device()->devicePixelRatio(); + const auto pixmap = menuitem->icon.pixmap({size, size}, dpr, mode, + checked ? QIcon::On : QIcon::Off); QRect pmr(QPoint(0, 0), pixmap.deviceIndependentSize().toSize()); pmr.moveCenter(vCheckRect.center()); painter->setPen(menuitem->palette.text().color());