don't apply a frame to image previews, if the preview is a very small image (e. g. an icon)

CCMAIL: [email protected]

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

1 files changed, 6 insertions, 2 deletions

diff --git a/src/iconmanager.cpp b/src/iconmanager.cpp
index cfdf13a7c..b46328cea 100644
--- a/src/iconmanager.cpp
+++ b/src/iconmanager.cpp
@@ -294,8 +294,12 @@ void IconManager::applyCutItemEffect()
 bool IconManager::applyImageFrame(QPixmap& icon)
 {
     const QSize maxSize = m_view->iconSize();
-    if ((maxSize.width() <= 24) || (maxSize.height() <= 24)) {
-        // the maximum size is too small for a frame
+    const bool applyFrame = (maxSize.width()  > KIconLoader::SizeSmallMedium) &&
+                            (maxSize.height() > KIconLoader::SizeSmallMedium) &&
+                            ((icon.width()  > KIconLoader::SizeLarge) ||
+                             (icon.height() > KIconLoader::SizeLarge));
+    if (!applyFrame) {
+        // the maximum size or the image itself is too small for a frame
         return false;
     }