review comments

diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp
index 18b1935722a663485d14d0c41a1d24fcafd67d45..5efb820b0b9b2f5d41d84c92c973f9dc3b9114fb 100644 (file)
--- a/src/kitemviews/kfileitemlistview.cpp
+++ b/src/kitemviews/kfileitemlistview.cpp
@@ -156,9 +156,9 @@ QPixmap KFileItemListView::createDragPixmap(const KItemSet& indexes) const
         yCount = xCount;
     }
 
         yCount = xCount;
     }
 

-    qreal dpr = scene()->views()[0]->devicePixelRatio();
+    const qreal dpr = scene()->views()[0]->devicePixelRatio();

     // Draw the selected items into the grid cells.
     // Draw the selected items into the grid cells.

-    QPixmap dragPixmap(QSize(xCount * size + xCount, yCount * size + yCount)*dpr);
+    QPixmap dragPixmap(QSize(xCount * size + xCount, yCount * size + yCount) * dpr);

     dragPixmap.setDevicePixelRatio(dpr);
     dragPixmap.fill(Qt::transparent);
 
     dragPixmap.setDevicePixelRatio(dpr);
     dragPixmap.fill(Qt::transparent);
 

diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp
index 068118983ea3aa8cb16417fa7804b161d797c224..b03fd9c1a37667ee6a320b80128b176cfcbc1443 100644 (file)
--- a/src/kitemviews/kfileitemmodelrolesupdater.cpp
+++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp
@@ -493,7 +493,7 @@ void KFileItemModelRolesUpdater::slotGotPreview(const KFileItem& item, const QPi
     const QString mimeTypeGroup = mimeType.left(slashIndex);
     if (mimeTypeGroup == QLatin1String("image")) {
         if (m_enlargeSmallPreviews) {
     const QString mimeTypeGroup = mimeType.left(slashIndex);
     if (mimeTypeGroup == QLatin1String("image")) {
         if (m_enlargeSmallPreviews) {

-            KPixmapModifier::applyFrame(scaledPixmap, m_iconSize * scaledPixmap.devicePixelRatio());
+            KPixmapModifier::applyFrame(scaledPixmap, m_iconSize);

         } else {
             // Assure that small previews don't get enlarged. Instead they
             // should be shown centered within the frame.
         } else {
             // Assure that small previews don't get enlarged. Instead they
             // should be shown centered within the frame.


@@ -501,8 +501,8 @@ void KFileItemModelRolesUpdater::slotGotPreview(const KFileItem& item, const QPi
             const bool enlargingRequired = scaledPixmap.width()  < contentSize.width() &&
                                            scaledPixmap.height() < contentSize.height();
             if (enlargingRequired) {
             const bool enlargingRequired = scaledPixmap.width()  < contentSize.width() &&
                                            scaledPixmap.height() < contentSize.height();
             if (enlargingRequired) {

-                QSize frameSize = scaledPixmap.size();
-                frameSize.scale(m_iconSize * scaledPixmap.devicePixelRatio(), Qt::KeepAspectRatio);
+                QSize frameSize = scaledPixmap.size() / scaledPixmap.devicePixelRatio();
+                frameSize.scale(m_iconSize, Qt::KeepAspectRatio);

 
                 QPixmap largeFrame(frameSize);
                 largeFrame.fill(Qt::transparent);
 
                 QPixmap largeFrame(frameSize);
                 largeFrame.fill(Qt::transparent);


@@ -517,11 +517,11 @@ void KFileItemModelRolesUpdater::slotGotPreview(const KFileItem& item, const QPi
             } else {
                 // The image must be shrinked as it is too large to fit into
                 // the available icon size
             } else {
                 // The image must be shrinked as it is too large to fit into
                 // the available icon size

-                KPixmapModifier::applyFrame(scaledPixmap, m_iconSize * scaledPixmap.devicePixelRatio());
+                KPixmapModifier::applyFrame(scaledPixmap, m_iconSize);

             }
         }
     } else {
             }
         }
     } else {

-        KPixmapModifier::scale(scaledPixmap, m_iconSize * scaledPixmap.devicePixelRatio());
+        KPixmapModifier::scale(scaledPixmap, m_iconSize);

     }
 
     QHash<QByteArray, QVariant> data = rolesData(item);
     }
 
     QHash<QByteArray, QVariant> data = rolesData(item);

diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp
index 170517754734678d6836b860e9b80f17f18dfe43..1112460a9670941ddc52b545fe1c9f8965385b9f 100644 (file)
--- a/src/kitemviews/kstandarditemlistwidget.cpp
+++ b/src/kitemviews/kstandarditemlistwidget.cpp
@@ -40,7 +40,6 @@
 #include <QTextLayout>
 #include <QTextLine>
 #include <QPixmapCache>
 #include <QTextLayout>
 #include <QTextLine>
 #include <QPixmapCache>

-#include <QDebug>

 #include <QGuiApplication>
 
 // #define KSTANDARDITEMLISTWIDGET_DEBUG
 #include <QGuiApplication>
 
 // #define KSTANDARDITEMLISTWIDGET_DEBUG


@@ -956,9 +955,8 @@ void KStandardItemListWidget::updatePixmapCache()
             }
             const QStringList overlays = values["iconOverlays"].toStringList();
             m_pixmap = pixmapForIcon(iconName, overlays, maxIconHeight);
             }
             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());
             // 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)
 {
 
 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());
         QPixmap scaledPixmap = pixmap;
         KPixmapModifier::scale(scaledPixmap, m_scaledPixmapSize * qApp->devicePixelRatio());

+        scaledPixmap.setDevicePixelRatio(qApp->devicePixelRatio());

         painter->drawPixmap(m_pixmapPos, scaledPixmap);
 
 #ifdef KSTANDARDITEMLISTWIDGET_DEBUG
         painter->drawPixmap(m_pixmapPos, scaledPixmap);
 
 #ifdef KSTANDARDITEMLISTWIDGET_DEBUG

diff --git a/src/kitemviews/private/kpixmapmodifier.cpp b/src/kitemviews/private/kpixmapmodifier.cpp
index 3e0edf02c48eef2a5126ed29a88ee91807b82f96..4693b313abde034edb6cf13d388297c7171a31e4 100644 (file)
--- a/src/kitemviews/private/kpixmapmodifier.cpp
+++ b/src/kitemviews/private/kpixmapmodifier.cpp
@@ -38,6 +38,7 @@
 #include <QPainter>
 #include <QPixmap>
 #include <QSize>
 #include <QPainter>
 #include <QPixmap>
 #include <QSize>

+#include <QGuiApplication>

 
 
 #include <config-X11.h> // for HAVE_XRENDER
 
 
 #include <config-X11.h> // for HAVE_XRENDER


@@ -374,22 +375,23 @@ void KPixmapModifier::scale(QPixmap& pixmap, const QSize& scaledSize)
 void KPixmapModifier::applyFrame(QPixmap& icon, const QSize& scaledSize)
 {
     static TileSet tileSet;
 void KPixmapModifier::applyFrame(QPixmap& icon, const QSize& scaledSize)
 {
     static TileSet tileSet;

-    qreal dpr = icon.devicePixelRatio();
+    qreal dpr = qApp->devicePixelRatio();

 
     // Resize the icon to the maximum size minus the space required for the frame
 
     // Resize the icon to the maximum size minus the space required for the frame

-    const QSize size(scaledSize.width() - (TileSet::LeftMargin + TileSet::RightMargin) * dpr,
-                     scaledSize.height() - (TileSet::TopMargin + TileSet::BottomMargin) * dpr);
-    scale(icon, size);
+    const QSize size(scaledSize.width() - TileSet::LeftMargin - TileSet::RightMargin,
+                     scaledSize.height() - TileSet::TopMargin - TileSet::BottomMargin);
+    scale(icon, size * dpr);
+    icon.setDevicePixelRatio(dpr);

 
     QPixmap framedIcon(icon.size().width() + (TileSet::LeftMargin + TileSet::RightMargin) * dpr,
 
     QPixmap framedIcon(icon.size().width() + (TileSet::LeftMargin + TileSet::RightMargin) * dpr,

-                       icon.size().height() + (TileSet::TopMargin + TileSet::BottomMargin * dpr) );
+                       icon.size().height() + (TileSet::TopMargin + TileSet::BottomMargin) * dpr);

     framedIcon.setDevicePixelRatio(dpr);
     framedIcon.fill(Qt::transparent);
 
     QPainter painter;
     painter.begin(&framedIcon);
     painter.setCompositionMode(QPainter::CompositionMode_Source);
     framedIcon.setDevicePixelRatio(dpr);
     framedIcon.fill(Qt::transparent);
 
     QPainter painter;
     painter.begin(&framedIcon);
     painter.setCompositionMode(QPainter::CompositionMode_Source);

-    tileSet.paint(&painter, framedIcon.rect());
+    tileSet.paint(&painter, QRect(QPoint(0,0), framedIcon.size() / dpr));

     painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
     painter.drawPixmap(TileSet::LeftMargin, TileSet::TopMargin, icon);
 
     painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
     painter.drawPixmap(TileSet::LeftMargin, TileSet::TopMargin, icon);
 

diff --git a/src/kitemviews/private/kpixmapmodifier.h b/src/kitemviews/private/kpixmapmodifier.h
index 9089a100174c7763d56a5734c5fd83dcdb6878b7..e48abf515fae503a1e789a2f84afb8117555cfe3 100644 (file)
--- a/src/kitemviews/private/kpixmapmodifier.h
+++ b/src/kitemviews/private/kpixmapmodifier.h
@@ -37,7 +37,8 @@ public:
 
     /**
      * Resize and paint a frame round an icon
 
     /**
      * Resize and paint a frame round an icon

-     * @arg scaledSize is assumed to be the scaled to the same device pixel ratio as the source icon
+     * @arg scaledSize is in device-independent pixels
+     * The returned image will be scaled by the application devicePixelRatio

      */
     static void applyFrame(QPixmap& icon, const QSize& scaledSize);
 
      */
     static void applyFrame(QPixmap& icon, const QSize& scaledSize);