assure that the widgets of the panels are resized after receiving the Polish event

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

diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index 3bb54b0bd22a78450e5d581e099fcfb90d13093e..1164a5591c001a4dcb08edcb13f57f59d7111f7a 100644 (file)
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -245,36 +245,27 @@ void InformationPanelContent::showItems(const KFileItemList& items)
 
 bool InformationPanelContent::eventFilter(QObject* obj, QEvent* event)
 {
-    if (event->type() == QEvent::Resize) {
+    switch (event->type()) {
+    case QEvent::Resize: {
         QResizeEvent* resizeEvent = static_cast<QResizeEvent*>(event);
         if (obj == m_metaDataArea->viewport()) {
             // The size of the meta text area has changed. Adjust the fixed
             // width in a way that no horizontal scrollbar needs to be shown.
             m_metaDataWidget->setFixedWidth(resizeEvent->size().width());
         } else if (obj == parent()) {
-            // If the text inside the name label or the info label cannot
-            // get wrapped, then the maximum width of the label is increased
-            // so that the width of the information panel gets increased.
-            // To prevent this, the maximum width is adjusted to
-            // the current width of the panel.
-            const int maxWidth = resizeEvent->size().width() - KDialog::spacingHint() * 4;
-            m_nameLabel->setMaximumWidth(maxWidth);
-
-            // The metadata widget also contains a text widget which may return
-            // a large preferred width.
-            if (m_metaDataWidget != 0) {
-                m_metaDataWidget->setMaximumWidth(maxWidth);
-            }
+            adjustWidgetSizes(resizeEvent->size().width());
+        }
+        break;
+    }
 
-            // try to increase the preview as large as possible
-            m_preview->setSizeHint(QSize(maxWidth, maxWidth));
+    case QEvent::Polish:
+        adjustWidgetSizes(parentWidget()->width());
+        break;
 
-            if (m_phononWidget->isVisible() && (m_phononWidget->mode() == PhononWidget::Video)) {
-                // assure that the size of the video player is the same as the preview size
-                m_phononWidget->setVideoSize(QSize(maxWidth, maxWidth));
-            }
-        }
+    default:
+        break;
     }
+
     return Panel::eventFilter(obj, event);
 }
 
@@ -401,4 +392,29 @@ void InformationPanelContent::setNameLabelText(const QString& text)
     m_nameLabel->setText(wrappedText);
 }
 
+void InformationPanelContent::adjustWidgetSizes(int width)
+{
+    // If the text inside the name label or the info label cannot
+    // get wrapped, then the maximum width of the label is increased
+    // so that the width of the information panel gets increased.
+    // To prevent this, the maximum width is adjusted to
+    // the current width of the panel.
+    const int maxWidth = width - KDialog::spacingHint() * 4;
+    m_nameLabel->setMaximumWidth(maxWidth);
+
+    // The metadata widget also contains a text widget which may return
+    // a large preferred width.
+    if (m_metaDataWidget != 0) {
+        m_metaDataWidget->setMaximumWidth(maxWidth);
+    }
+
+    // try to increase the preview as large as possible
+    m_preview->setSizeHint(QSize(maxWidth, maxWidth));
+
+    if (m_phononWidget->isVisible() && (m_phononWidget->mode() == PhononWidget::Video)) {
+        // assure that the size of the video player is the same as the preview size
+        m_phononWidget->setVideoSize(QSize(maxWidth, maxWidth));
+    }
+}
+
 #include "informationpanelcontent.moc"

diff --git a/src/panels/information/informationpanelcontent.h b/src/panels/information/informationpanelcontent.h
index 923bb762f637ed96999ab56e49572b14576bc032..2f32cf71731eb838e24366b7ef8976d0508833a4 100644 (file)
--- a/src/panels/information/informationpanelcontent.h
+++ b/src/panels/information/informationpanelcontent.h
@@ -113,6 +113,12 @@ private:
      */
     void setNameLabelText(const QString& text);
 
+    /**
+     * Adjusts the sizes of the widgets dependent on the available
+     * width given by \p width.
+     */
+    void adjustWidgetSizes(int width);
+
 private:
     KFileItem m_item;