Remove the semitransparent effect for hidden items in the IconManager, it just takes...

BUG: 158807

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

diff --git a/src/iconmanager.cpp b/src/iconmanager.cpp
index 03dd70cf9ac82d74e93142e57379ef5651bd5b56..ae2b80b99bec5f2a90286b38597e0c481656abff 100644 (file)
--- a/src/iconmanager.cpp
+++ b/src/iconmanager.cpp
@@ -93,13 +93,6 @@ void IconManager::updatePreviews()
 
 void IconManager::updateIcons(const KFileItemList& items)
 {
 
 void IconManager::updateIcons(const KFileItemList& items)
 {

-    // make the icons of all hidden files semitransparent
-    foreach (KFileItem item, items) {
-        if (item.isHidden()) {
-            applyHiddenItemEffect(item);
-        }
-    }
-

     if (m_showPreview) {
         generatePreviews(items);
     }
     if (m_showPreview) {
         generatePreviews(items);
     }


@@ -139,16 +132,6 @@ void IconManager::replaceIcon(const KFileItem& item, const QPixmap& pixmap)
             limitToSize(icon, m_view->iconSize());
         }
 
             limitToSize(icon, m_view->iconSize());
         }
 

-        if (item.isHidden()) {
-            if (!icon.hasAlpha()) {
-                // the semitransparent operation requires having an alpha mask
-                QPixmap alphaMask(icon.size());
-                alphaMask.fill();
-                icon.setAlphaChannel(alphaMask);
-            }
-            KIconEffect::semiTransparent(icon);
-        }
-

         const QMimeData* mimeData = QApplication::clipboard()->mimeData();
         if (KonqMimeData::decodeIsCutSelection(mimeData) && isCutItem(item)) {
             KIconEffect iconEffect;
         const QMimeData* mimeData = QApplication::clipboard()->mimeData();
         if (KonqMimeData::decodeIsCutSelection(mimeData) && isCutItem(item)) {
             KIconEffect iconEffect;


@@ -264,19 +247,6 @@ void IconManager::applyCutItemEffect()
     }
 }
 
     }
 }
 

-void IconManager::applyHiddenItemEffect(const KFileItem& hiddenItem)
-{
-    const QModelIndex index = m_dolphinModel->indexForItem(hiddenItem);
-    const QVariant value = m_dolphinModel->data(index, Qt::DecorationRole);
-    if (value.type() == QVariant::Icon) {
-        const QIcon icon(qvariant_cast<QIcon>(value));
-        const QSize maxSize = m_view->iconSize();
-        QPixmap pixmap = icon.pixmap(maxSize.height(), maxSize.height()); // ignore the width
-        KIconEffect::semiTransparent(pixmap);
-        m_dolphinModel->setData(index, QIcon(pixmap), Qt::DecorationRole);
-    }
-}
-

 bool IconManager::applyImageFrame(QPixmap& icon)
 {
     const QSize maxSize = m_view->iconSize();
 bool IconManager::applyImageFrame(QPixmap& icon)
 {
     const QSize maxSize = m_view->iconSize();

diff --git a/src/iconmanager.h b/src/iconmanager.h
index e35b139897dd947421f2cb0ee60d7633253d45f8..888fb42ee8bd09b50f118f1833050d83b32d7b00 100644 (file)
--- a/src/iconmanager.h
+++ b/src/iconmanager.h
@@ -85,9 +85,6 @@ private:
     /** Applies an item effect to all cut items. */
     void applyCutItemEffect();
 
     /** Applies an item effect to all cut items. */
     void applyCutItemEffect();
 

-    /** Applies an item effect to the hidden item \a hiddenItem. */
-    void applyHiddenItemEffect(const KFileItem& hiddenItem);
-

     /**
      * Applies a frame around the icon. False is returned if
      * no frame has been added because the icon is too small.
     /**
      * Applies a frame around the icon. False is returned if
      * no frame has been added because the icon is too small.