From 80bc133da937e5351e5ed95443093ec1efac5640 Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Thu, 19 Jul 2018 10:17:16 +0200 Subject: [PATCH] [KItemListSelectionToggle] Adjust painting icon for high dpi scaling Instead of using KIconLoader which currently doesn't support high dpi scaling, use QIcon::fromTheme which can. Differential Revision: https://phabricator.kde.org/D14222 --- src/kitemviews/private/kitemlistselectiontoggle.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/kitemviews/private/kitemlistselectiontoggle.cpp b/src/kitemviews/private/kitemlistselectiontoggle.cpp index d6e434244..5519e4da8 100644 --- a/src/kitemviews/private/kitemlistselectiontoggle.cpp +++ b/src/kitemviews/private/kitemlistselectiontoggle.cpp @@ -21,9 +21,9 @@ #include +#include #include - KItemListSelectionToggle::KItemListSelectionToggle(QGraphicsItem* parent) : QGraphicsWidget(parent, nullptr), m_checked(false), @@ -67,8 +67,8 @@ void KItemListSelectionToggle::paint(QPainter* painter, const QStyleOptionGraphi updatePixmap(); } - const qreal x = (size().width() - qreal(m_pixmap.width())) / 2; - const qreal y = (size().height() - qreal(m_pixmap.height())) / 2; + const qreal x = (size().width() - qreal(m_pixmap.width() / m_pixmap.devicePixelRatioF())) / 2; + const qreal y = (size().height() - qreal(m_pixmap.height() / m_pixmap.devicePixelRatioF())) / 2; painter->drawPixmap(x, y, m_pixmap); } @@ -77,7 +77,7 @@ void KItemListSelectionToggle::resizeEvent(QGraphicsSceneResizeEvent* event) QGraphicsWidget::resizeEvent(event); if (!m_pixmap.isNull()) { - const int pixmapSize = m_pixmap.size().width(); // Pixmap width is always equal pixmap height + const int pixmapSize = m_pixmap.size().width() / m_pixmap.devicePixelRatioF(); // Pixmap width is always equal pixmap height if (pixmapSize != iconSize()) { // If the required icon size is different from the actual pixmap size, @@ -91,8 +91,7 @@ void KItemListSelectionToggle::resizeEvent(QGraphicsSceneResizeEvent* event) void KItemListSelectionToggle::updatePixmap() { const QString icon = m_checked ? QStringLiteral("emblem-remove") : QStringLiteral("emblem-added"); - const KIconLoader::States state = m_hovered ? KIconLoader::ActiveState : KIconLoader::DisabledState; - m_pixmap = KIconLoader::global()->loadIcon(icon, KIconLoader::Desktop, iconSize(), state); + m_pixmap = QIcon::fromTheme(icon).pixmap(iconSize(), m_hovered ? QIcon::Active : QIcon::Disabled); } int KItemListSelectionToggle::iconSize() const