Prevent that icons overlap in Details View when zooming.

The problem was that a maximum size was assigned to KFileItemDelegate
for displaying items without considering that icon zooming may change
the item height.

CCBUG: 234600

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

diff --git a/src/views/dolphindetailsview.cpp b/src/views/dolphindetailsview.cpp
index d14186383e15e5cc4b175059d7f680d7bae2ab25..04ce06f6d3036247fac986afd4abe1b706181204 100644 (file)
--- a/src/views/dolphindetailsview.cpp
+++ b/src/views/dolphindetailsview.cpp
@@ -1070,7 +1070,19 @@ void DolphinDetailsView::updateDecorationSize(bool showPreview)
     setIconSize(QSize(iconSize, iconSize));
     m_decorationSize = QSize(iconSize, iconSize);
 
     setIconSize(QSize(iconSize, iconSize));
     m_decorationSize = QSize(iconSize, iconSize);
 

+    if (m_extensionsFactory) {
+        // The old maximumSize used by KFileItemDelegate is not valid any more after the icon size change.
+        // It must be discarded before doItemsLayout() is called (see bug 234600).
+        m_extensionsFactory->fileItemDelegate()->setMaximumSize(QSize());
+    }
+

     doItemsLayout();
     doItemsLayout();

+
+    // Calculate the new maximumSize for KFileItemDelegate after the icon size change.
+    QModelIndex current = currentIndex();
+    if (current.isValid()) {
+        adjustMaximumSizeForEditing(current);
+    }

 }
 
 KFileItemDelegate::Information DolphinDetailsView::infoForColumn(int columnIndex) const
 }
 
 KFileItemDelegate::Information DolphinDetailsView::infoForColumn(int columnIndex) const