* Use the height of the icon as factor for the toggle size. This prevents that the...

* Use a larger toggle size starting with 48x48-sized icons.

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

diff --git a/src/selectionmanager.cpp b/src/selectionmanager.cpp
index 129e7e2ca7407cf16f70f02297b0fb68be073a29..7dd07e63efa42337db2fb2759a0fee978bfdfbd0 100644 (file)
--- a/src/selectionmanager.cpp
+++ b/src/selectionmanager.cpp
@@ -88,9 +88,10 @@ void SelectionManager::slotEntered(const QModelIndex& index)
         m_toggle->move(QPoint(x, y));
 
         // increase the size of the toggle for large items
         m_toggle->move(QPoint(x, y));
 
         // increase the size of the toggle for large items

-        if (rect.height() >= KIconLoader::SizeEnormous) {
+        const int height = m_view->iconSize().height();
+        if (height >= KIconLoader::SizeEnormous) {

             m_toggle->resize(KIconLoader::SizeMedium, KIconLoader::SizeMedium);
             m_toggle->resize(KIconLoader::SizeMedium, KIconLoader::SizeMedium);

-        } else if (rect.height() >= KIconLoader::SizeHuge) {
+        } else if (height >= KIconLoader::SizeLarge) {

             m_toggle->resize(KIconLoader::SizeSmallMedium, KIconLoader::SizeSmallMedium);
         } else {
             m_toggle->resize(KIconLoader::SizeSmall, KIconLoader::SizeSmall);
             m_toggle->resize(KIconLoader::SizeSmallMedium, KIconLoader::SizeSmallMedium);
         } else {
             m_toggle->resize(KIconLoader::SizeSmall, KIconLoader::SizeSmall);