Fix issue that icon overlay is missing for links

BUG: 288609
FIXED-IN: 4.8.0

diff --git a/src/kitemviews/kfileitemlistwidget.cpp b/src/kitemviews/kfileitemlistwidget.cpp
index 9668270176a460ff0f1409a5e658dafebac2affd..13832a80bc3fb211a2fd866c29b13250e5b0a0b7 100644 (file)
--- a/src/kitemviews/kfileitemlistwidget.cpp
+++ b/src/kitemviews/kfileitemlistwidget.cpp
@@ -460,7 +460,8 @@ void KFileItemListWidget::updatePixmapCache()
     if (!updatePixmap && m_dirtyContent) {
         updatePixmap = m_dirtyContentRoles.isEmpty()
                        || m_dirtyContentRoles.contains("iconPixmap")
     if (!updatePixmap && m_dirtyContent) {
         updatePixmap = m_dirtyContentRoles.isEmpty()
                        || m_dirtyContentRoles.contains("iconPixmap")

-                       || m_dirtyContentRoles.contains("iconName");
+                       || m_dirtyContentRoles.contains("iconName")
+                       || m_dirtyContentRoles.contains("iconOverlays");

     }
 
     if (updatePixmap) {
     }
 
     if (updatePixmap) {


@@ -507,6 +508,22 @@ void KFileItemListWidget::updatePixmapCache()
             m_originalPixmapSize = m_pixmap.size();
         }
 
             m_originalPixmapSize = m_pixmap.size();
         }
 

+        const QStringList overlays = values["iconOverlays"].toStringList();
+
+        // Strangely KFileItem::overlays() returns empty string-values, so
+        // we need to check first whether an overlay must be drawn at all.
+        // It is more efficient to do it here, as KIconLoader::drawOverlays()
+        // assumes that an overlay will be drawn and has some additional
+        // setup time.
+        foreach (const QString& overlay, overlays) {
+            if (!overlay.isEmpty()) {
+                // There is at least one overlay, draw all overlays above m_pixmap
+                // and cancel the check
+                KIconLoader::global()->drawOverlays(overlays, m_pixmap, KIconLoader::Desktop);
+                break;
+            }
+        }
+

         if (m_isCut) {
             applyCutEffect(m_pixmap);
         }
         if (m_isCut) {
             applyCutEffect(m_pixmap);
         }

diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp
index a55229722c86bd72c1b90cc371718859a0c2047a..65c11e0f595a45d03ba1fec4c7a4075348a63e74 100644 (file)
--- a/src/kitemviews/kfileitemmodelrolesupdater.cpp
+++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp
@@ -714,6 +714,8 @@ QHash<QByteArray, QVariant> KFileItemModelRolesUpdater::rolesData(const KFileIte
         data.insert("type", item.mimeComment());
     }
 
         data.insert("type", item.mimeComment());
     }
 

+    data.insert("iconOverlays", item.overlays());
+

     return data;
 }
 
     return data;
 }