diff options
| author | David Edmundson <[email protected]> | 2015-03-27 15:43:06 +0100 |
|---|---|---|
| committer | David Edmundson <[email protected]> | 2015-03-27 16:28:57 +0100 |
| commit | 1b6ee5d6cd918b81c59a5163c9d6371f35f9885c (patch) | |
| tree | c3163b42590feb0d53962c51e1c42c9eaf3e0453 /src/kitemviews/kstandarditemlistwidget.cpp | |
| parent | 35c0972671c1f90f76d8d86b002b2e1f8bac79dd (diff) | |
review comments
Diffstat (limited to 'src/kitemviews/kstandarditemlistwidget.cpp')
| -rw-r--r-- | src/kitemviews/kstandarditemlistwidget.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp index 170517754..1112460a9 100644 --- a/src/kitemviews/kstandarditemlistwidget.cpp +++ b/src/kitemviews/kstandarditemlistwidget.cpp @@ -40,7 +40,6 @@ #include <QTextLayout> #include <QTextLine> #include <QPixmapCache> -#include <QDebug> #include <QGuiApplication> // #define KSTANDARDITEMLISTWIDGET_DEBUG @@ -956,9 +955,8 @@ void KStandardItemListWidget::updatePixmapCache() } const QStringList overlays = values["iconOverlays"].toStringList(); m_pixmap = pixmapForIcon(iconName, overlays, maxIconHeight); -// qDebug() << "attempt 2 - setting pixmap to one of size " << m_pixmap.size() << m_pixmap.devicePixelRatio(); - } else if (m_pixmap.width() / qApp->devicePixelRatio() != maxIconWidth || m_pixmap.height() / qApp->devicePixelRatio() != maxIconHeight) { + } else if (m_pixmap.width() / m_pixmap.devicePixelRatio() != maxIconWidth || m_pixmap.height() / m_pixmap.devicePixelRatio() != maxIconHeight) { // A custom pixmap has been applied. Assure that the pixmap // is scaled to the maximum available size. KPixmapModifier::scale(m_pixmap, QSize(maxIconWidth, maxIconHeight) * qApp->devicePixelRatio()); @@ -1357,9 +1355,10 @@ void KStandardItemListWidget::updateAdditionalInfoTextColor() void KStandardItemListWidget::drawPixmap(QPainter* painter, const QPixmap& pixmap) { - if (m_scaledPixmapSize * qApp->devicePixelRatio() != pixmap.size()) { + if (m_scaledPixmapSize != pixmap.size() / pixmap.devicePixelRatio()) { QPixmap scaledPixmap = pixmap; KPixmapModifier::scale(scaledPixmap, m_scaledPixmapSize * qApp->devicePixelRatio()); + scaledPixmap.setDevicePixelRatio(qApp->devicePixelRatio()); painter->drawPixmap(m_pixmapPos, scaledPixmap); #ifdef KSTANDARDITEMLISTWIDGET_DEBUG |