[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/applets/tasks
From:       Marco Martin <notmart () gmail ! com>
Date:       2009-09-13 17:17:15
Message-ID: 1252862235.425575.7650.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1022992 by mart:

don't try to alter the size if the icon isn't square, wouldn't look
better anyways
BUG:200178


 M  +8 -6      abstracttaskitem.cpp  


--- trunk/KDE/kdebase/workspace/plasma/applets/tasks/abstracttaskitem.cpp \
#1022991:1022992 @@ -926,12 +926,14 @@
 
     QSize iconSize = m_icon.actualSize(bounds.size().toSize());
 
-    if (iconSize.width() > KIconLoader::SizeSmall && iconSize.width() < \
                KIconLoader::SizeSmallMedium) {
-        iconSize = QSize(KIconLoader::SizeSmall, KIconLoader::SizeSmall);
-    } else if (iconSize.width() > KIconLoader::SizeSmallMedium && iconSize.width() < \
                KIconLoader::SizeMedium) {
-        iconSize = QSize(KIconLoader::SizeSmallMedium, \
                KIconLoader::SizeSmallMedium);
-    } else if (iconSize.width() > KIconLoader::SizeMedium && iconSize.width() < \
                KIconLoader::SizeLarge) {
-        iconSize = QSize(KIconLoader::SizeMedium, KIconLoader::SizeMedium);
+    if (iconSize.width() == iconSize.height()) {
+        if (iconSize.width() > KIconLoader::SizeSmall && iconSize.width() < \
KIconLoader::SizeSmallMedium) { +            iconSize = QSize(KIconLoader::SizeSmall, \
KIconLoader::SizeSmall); +        } else if (iconSize.width() > \
KIconLoader::SizeSmallMedium && iconSize.width() < KIconLoader::SizeMedium) { +       \
iconSize = QSize(KIconLoader::SizeSmallMedium, KIconLoader::SizeSmallMedium); +       \
} else if (iconSize.width() > KIconLoader::SizeMedium && iconSize.width() < \
KIconLoader::SizeLarge) { +            iconSize = QSize(KIconLoader::SizeMedium, \
KIconLoader::SizeMedium); +        }
     }
 
     return QStyle::alignedRect(QApplication::layoutDirection(), Qt::AlignLeft | \
Qt::AlignVCenter,


[prev in list] [next in list] [prev in thread] [next in thread]