From: David Edmundson <kde@davidedmundson.co.uk>
Date: Mon, 30 Mar 2015 11:39:17 +0000 (+0200)
Subject: Merge branch 'davidedmundson/highdpi'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/4ed0b82b02aa787ba25bdc5a5e5a99037fdb6efa?hp=-c

Merge branch 'davidedmundson/highdpi'

REVIEW: 123137
---

4ed0b82b02aa787ba25bdc5a5e5a99037fdb6efa
diff --combined src/kitemviews/kfileitemlistview.cpp
index d912a6c5c,5efb820b0..a740a3a23
--- a/src/kitemviews/kfileitemlistview.cpp
+++ b/src/kitemviews/kfileitemlistview.cpp
@@@ -29,6 -29,8 +29,8 @@@
  
  #include <QPainter>
  #include <QTimer>
+ #include <QGraphicsScene>
+ #include <QGraphicsView>
  
  // #define KFILEITEMLISTVIEW_DEBUG
  
@@@ -41,7 -43,7 +43,7 @@@ namespace 
  
      // If the icon size changes, a longer delay is used. This prevents that
      // the expensive re-generation of all previews is triggered repeatedly when
 -    // chaning the zoom level.
 +    // changing the zoom level.
      const int LongInterval = 300;
  }
  
@@@ -154,8 -156,10 +156,10 @@@ QPixmap KFileItemListView::createDragPi
          yCount = xCount;
      }
  
+     const qreal dpr = scene()->views()[0]->devicePixelRatio();
      // Draw the selected items into the grid cells.
-     QPixmap dragPixmap(xCount * size + xCount, yCount * size + yCount);
+     QPixmap dragPixmap(QSize(xCount * size + xCount, yCount * size + yCount) * dpr);
+     dragPixmap.setDevicePixelRatio(dpr);
      dragPixmap.fill(Qt::transparent);
  
      QPainter painter(&dragPixmap);
@@@ -168,7 -172,7 +172,7 @@@
              QIcon icon = QIcon::fromTheme(model()->data(index).value("iconName").toString());
              pixmap = icon.pixmap(size, size);
          } else {
-             KPixmapModifier::scale(pixmap, QSize(size, size));
+             KPixmapModifier::scale(pixmap, QSize(size, size) * dpr);
          }
  
          painter.drawPixmap(x, y, pixmap);