* prevent that cut icons are shift left in the icons view by using the correct size

* apply cut item effect before generating previews

BUG: 161707

svn path=/trunk/KDE/kdebase/apps/; revision=804768

diff --git a/src/iconmanager.cpp b/src/iconmanager.cpp
index c6c07be7bd9b1eb10299c6e426f3f441fd753565..6bd916917ba5c605b6c7a319971c99baad034d02 100644 (file)
--- a/src/iconmanager.cpp
+++ b/src/iconmanager.cpp
@@ -98,6 +98,8 @@ void IconManager::updatePreviews()
 
 void IconManager::generatePreviews(const KFileItemList &items)
 {
+    applyCutItemEffect();
+
     if (!m_showPreview) {
         return;
     }
@@ -274,7 +276,10 @@ void IconManager::applyCutItemEffect()
             const QVariant value = m_dolphinModel->data(index, Qt::DecorationRole);
             if (value.type() == QVariant::Icon) {
                 const QIcon icon(qvariant_cast<QIcon>(value));
-                QPixmap pixmap = icon.pixmap(m_view->iconSize());
+                const QSize actualSize = icon.actualSize(m_view->iconSize());
+                QPixmap pixmap = icon.pixmap(actualSize);
+                //QSize size(m_view->iconSize().height(), m_view->iconSize().height());
+                //QPixmap pixmap = icon.pixmap(size);
 
                 // remember current pixmap for the item to be able
                 // to restore it when other items get cut