assure that the maximum size of the item-delegate gets updated before showing the...

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

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index 6235fcd871ddfa947a420bb8f7e980ac13c3e341..9b9252857ef11aa03445ff3abcf9469cfcf4fe18 100644 (file)
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -255,6 +255,15 @@ void DolphinIconsView::wheelEvent(QWheelEvent* event)
     }
 }
 
+void DolphinIconsView::showEvent(QShowEvent* event)
+{
+    Q_ASSERT(qobject_cast<DolphinFileItemDelegate*>(itemDelegate()) != 0);
+    DolphinFileItemDelegate* delegate = static_cast<DolphinFileItemDelegate*>(itemDelegate());
+    delegate->setMaximumSize(m_itemSize);
+
+    KCategorizedView::showEvent(event);
+}
+
 void DolphinIconsView::slotShowPreviewChanged()
 {
     const DolphinView* view = m_controller->dolphinView();

diff --git a/src/dolphiniconsview.h b/src/dolphiniconsview.h
index e8e63eaf877a657bf984ac1560480eb00eda371d..01aac03f2f52f41dc39ecf32a5345dde76df6069 100644 (file)
--- a/src/dolphiniconsview.h
+++ b/src/dolphiniconsview.h
@@ -59,6 +59,7 @@ protected:
     virtual void dropEvent(QDropEvent* event);
     virtual void keyPressEvent(QKeyEvent* event);
     virtual void wheelEvent(QWheelEvent* event);
+    virtual void showEvent(QShowEvent* event);
 
 private slots:
     void slotShowPreviewChanged();