Merge branch 'Applications/16.04'

[dolphin.git] / src / kitemviews / kstandarditemlistwidget.cpp

diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp
index 8633a257104480ad8925a118eda67bea70d628ee..51c5bc896a588f03a450cee07dd4e69d1a6a1918 100644 (file)
--- a/src/kitemviews/kstandarditemlistwidget.cpp
+++ b/src/kitemviews/kstandarditemlistwidget.cpp
@@ -22,19 +22,16 @@
 #include "kfileitemlistview.h"
 #include "kfileitemmodel.h"
 
 #include "kfileitemlistview.h"
 #include "kfileitemmodel.h"
 

-#include <KIcon>
+#include <QIcon>

 #include <KIconEffect>
 #include <KIconLoader>
 #include <KIconEffect>
 #include <KIconLoader>

-#include <KLocale>
-#include <kratingpainter.h>
+#include <KRatingPainter>

 #include <KStringHandler>
 #include <KStringHandler>

-#include <KDebug>

 
 #include "private/kfileitemclipboard.h"
 #include "private/kitemlistroleeditor.h"
 #include "private/kpixmapmodifier.h"
 
 
 #include "private/kfileitemclipboard.h"
 #include "private/kitemlistroleeditor.h"
 #include "private/kpixmapmodifier.h"
 

-#include <QFontMetricsF>

 #include <QGraphicsScene>
 #include <QGraphicsSceneResizeEvent>
 #include <QGraphicsView>
 #include <QGraphicsScene>
 #include <QGraphicsSceneResizeEvent>
 #include <QGraphicsView>


@@ -43,6 +40,7 @@
 #include <QTextLayout>
 #include <QTextLine>
 #include <QPixmapCache>
 #include <QTextLayout>
 #include <QTextLine>
 #include <QPixmapCache>

+#include <QGuiApplication>

 
 // #define KSTANDARDITEMLISTWIDGET_DEBUG
 
 
 // #define KSTANDARDITEMLISTWIDGET_DEBUG
 


@@ -120,6 +118,8 @@ QString KStandardItemListWidgetInformant::itemText(int index, const KItemListVie
 
 bool KStandardItemListWidgetInformant::itemIsLink(int index, const KItemListView* view) const
 {
 
 bool KStandardItemListWidgetInformant::itemIsLink(int index, const KItemListView* view) const
 {

+    Q_UNUSED(index);
+    Q_UNUSED(view);

     return false;
 }
 
     return false;
 }
 


@@ -343,6 +343,7 @@ void KStandardItemListWidget::paint(QPainter* painter, const QStyleOptionGraphic
              */
             // Paint pixmap1 so that pixmap1 = m_pixmap * (1.0 - hoverOpacity())
             QPixmap pixmap1(m_pixmap.size());
              */
             // Paint pixmap1 so that pixmap1 = m_pixmap * (1.0 - hoverOpacity())
             QPixmap pixmap1(m_pixmap.size());

+            pixmap1.setDevicePixelRatio(m_pixmap.devicePixelRatio());

             pixmap1.fill(Qt::transparent);
             {
                 QPainter p(&pixmap1);
             pixmap1.fill(Qt::transparent);
             {
                 QPainter p(&pixmap1);


@@ -352,6 +353,7 @@ void KStandardItemListWidget::paint(QPainter* painter, const QStyleOptionGraphic
 
             // Paint pixmap2 so that pixmap2 = m_hoverPixmap * hoverOpacity()
             QPixmap pixmap2(pixmap1.size());
 
             // Paint pixmap2 so that pixmap2 = m_hoverPixmap * hoverOpacity()
             QPixmap pixmap2(pixmap1.size());

+            pixmap2.setDevicePixelRatio(pixmap1.devicePixelRatio());

             pixmap2.fill(Qt::transparent);
             {
                 QPainter p(&pixmap2);
             pixmap2.fill(Qt::transparent);
             {
                 QPainter p(&pixmap2);


@@ -682,7 +684,7 @@ void KStandardItemListWidget::dataChanged(const QHash<QByteArray, QVariant>& cur
     // The URL might have changed (i.e., if the sort order of the items has
     // been changed). Therefore, the "is cut" state must be updated.
     KFileItemClipboard* clipboard = KFileItemClipboard::instance();
     // The URL might have changed (i.e., if the sort order of the items has
     // been changed). Therefore, the "is cut" state must be updated.
     KFileItemClipboard* clipboard = KFileItemClipboard::instance();

-    const KUrl itemUrl = data().value("url").value<KUrl>();
+    const QUrl itemUrl = data().value("url").toUrl();

     m_isCut = clipboard->isCut(itemUrl);
 
     // The icon-state might depend from other roles and hence is
     m_isCut = clipboard->isCut(itemUrl);
 
     // The icon-state might depend from other roles and hence is


@@ -833,7 +835,7 @@ void KStandardItemListWidget::showEvent(QShowEvent* event)
     // Listen to changes of the clipboard to mark the item as cut/uncut
     KFileItemClipboard* clipboard = KFileItemClipboard::instance();
 
     // Listen to changes of the clipboard to mark the item as cut/uncut
     KFileItemClipboard* clipboard = KFileItemClipboard::instance();
 

-    const KUrl itemUrl = data().value("url").value<KUrl>();
+    const QUrl itemUrl = data().value("url").toUrl();

     m_isCut = clipboard->isCut(itemUrl);
 
     connect(clipboard, &KFileItemClipboard::cutItemsChanged,
     m_isCut = clipboard->isCut(itemUrl);
 
     connect(clipboard, &KFileItemClipboard::cutItemsChanged,


@@ -850,7 +852,7 @@ void KStandardItemListWidget::hideEvent(QHideEvent* event)
 
 void KStandardItemListWidget::slotCutItemsChanged()
 {
 
 void KStandardItemListWidget::slotCutItemsChanged()
 {

-    const KUrl itemUrl = data().value("url").value<KUrl>();
+    const QUrl itemUrl = data().value("url").toUrl();

     const bool isCut = KFileItemClipboard::instance()->isCut(itemUrl);
     if (m_isCut != isCut) {
         m_isCut = isCut;
     const bool isCut = KFileItemClipboard::instance()->isCut(itemUrl);
     if (m_isCut != isCut) {
         m_isCut = isCut;


@@ -949,14 +951,15 @@ void KStandardItemListWidget::updatePixmapCache()
             if (iconName.isEmpty()) {
                 // The icon-name has not been not resolved by KFileItemModelRolesUpdater,
                 // use a generic icon as fallback
             if (iconName.isEmpty()) {
                 // The icon-name has not been not resolved by KFileItemModelRolesUpdater,
                 // use a generic icon as fallback

-                iconName = QLatin1String("unknown");
+                iconName = QStringLiteral("unknown");

             }
             const QStringList overlays = values["iconOverlays"].toStringList();
             m_pixmap = pixmapForIcon(iconName, overlays, maxIconHeight);
             }
             const QStringList overlays = values["iconOverlays"].toStringList();
             m_pixmap = pixmapForIcon(iconName, overlays, maxIconHeight);

-        } else if (m_pixmap.width() != maxIconWidth || m_pixmap.height() != 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.
             // A custom pixmap has been applied. Assure that the pixmap
             // is scaled to the maximum available size.

-            KPixmapModifier::scale(m_pixmap, QSize(maxIconWidth, maxIconHeight));
+            KPixmapModifier::scale(m_pixmap, QSize(maxIconWidth, maxIconHeight) * qApp->devicePixelRatio());

         }
 
         if (m_isCut) {
         }
 
         if (m_isCut) {


@@ -1352,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 != pixmap.size()) {
+    if (m_scaledPixmapSize != pixmap.size() / pixmap.devicePixelRatio()) {

         QPixmap scaledPixmap = pixmap;
         QPixmap scaledPixmap = pixmap;

-        KPixmapModifier::scale(scaledPixmap, m_scaledPixmapSize);
+        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


@@ -1386,7 +1390,7 @@ void KStandardItemListWidget::drawSiblingsInformation(QPainter* painter)
             if (m_isExpandable) {
                 option.state |= QStyle::State_Children;
             }
             if (m_isExpandable) {
                 option.state |= QStyle::State_Children;
             }

-            if (data()["isExpanded"].toBool()) {
+            if (data().value("isExpanded").toBool()) {

                 option.state |= QStyle::State_Open;
             }
             isItemSibling = false;
                 option.state |= QStyle::State_Open;
             }
             isItemSibling = false;


@@ -1436,11 +1440,13 @@ void KStandardItemListWidget::closeRoleEditor()
 
 QPixmap KStandardItemListWidget::pixmapForIcon(const QString& name, const QStringList& overlays, int size)
 {
 
 QPixmap KStandardItemListWidget::pixmapForIcon(const QString& name, const QStringList& overlays, int size)
 {

-    const QString key = "KStandardItemListWidget:" % name % ":" % overlays.join(":") % ":" % QString::number(size);
+    static const QIcon fallbackIcon = QIcon::fromTheme(QStringLiteral("unknown"));
+    size *= qApp->devicePixelRatio();
+    const QString key = "KStandardItemListWidget:" % name % ":" % overlays.join(QStringLiteral(":")) % ":" % QString::number(size);

     QPixmap pixmap;
 
     if (!QPixmapCache::find(key, pixmap)) {
     QPixmap pixmap;
 
     if (!QPixmapCache::find(key, pixmap)) {

-        const KIcon icon(name);
+        const QIcon icon = QIcon::fromTheme(name, fallbackIcon);

 
         int requestedSize;
         if (size <= KIconLoader::SizeSmall) {
 
         int requestedSize;
         if (size <= KIconLoader::SizeSmall) {


@@ -1461,7 +1467,7 @@ QPixmap KStandardItemListWidget::pixmapForIcon(const QString& name, const QStrin
             requestedSize = size;
         }
 
             requestedSize = size;
         }
 

-        pixmap = icon.pixmap(requestedSize, requestedSize);
+        pixmap = icon.pixmap(requestedSize / qApp->devicePixelRatio(), requestedSize / qApp->devicePixelRatio());

         if (requestedSize != size) {
             KPixmapModifier::scale(pixmap, QSize(size, size));
         }
         if (requestedSize != size) {
             KPixmapModifier::scale(pixmap, QSize(size, size));
         }


@@ -1482,6 +1488,7 @@ QPixmap KStandardItemListWidget::pixmapForIcon(const QString& name, const QStrin
 
         QPixmapCache::insert(key, pixmap);
     }
 
         QPixmapCache::insert(key, pixmap);
     }

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

 
     return pixmap;
 }
 
     return pixmap;
 }