Provide a default size-hint for all panels

This fixes the issue that the initial size of the Filter Panel is too small.

diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp
index 5cfce59e26cb8ef48492e7c02009b58c5c8c0ee4..43d7b64124bdc1777b3764185a2957495156b036 100644 (file)
--- a/src/panels/folders/folderspanel.cpp
+++ b/src/panels/folders/folderspanel.cpp
@@ -70,11 +70,6 @@ FoldersPanel::~FoldersPanel()
     m_dirLister = 0; // deleted by m_dolphinModel
 }
 
-QSize FoldersPanel::sizeHint() const
-{
-    return QSize(200, 400);
-}
-
 void FoldersPanel::setShowHiddenFiles(bool show)
 {
     FoldersPanelSettings::setShowHiddenFiles(show);

diff --git a/src/panels/folders/folderspanel.h b/src/panels/folders/folderspanel.h
index 2aa94d1ffd6ba14f71ed000b921bb9f15c74c9ac..43ae7bdd97a38bcd4c5e5d4181f56ed2de643f51 100644 (file)
--- a/src/panels/folders/folderspanel.h
+++ b/src/panels/folders/folderspanel.h
@@ -45,9 +45,6 @@ public:
     FoldersPanel(QWidget* parent = 0);
     virtual ~FoldersPanel();
 
-    /** @see QWidget::sizeHint() */
-    virtual QSize sizeHint() const;
-
     void setShowHiddenFiles(bool show);
     bool showHiddenFiles() const;
 

diff --git a/src/panels/information/informationpanel.cpp b/src/panels/information/informationpanel.cpp
index 6681dc30dbf6998b8f6283c6b87efb92a7e3939d..7759d591a3e4ab6437475914a4cd21c7cff749d1 100644 (file)
--- a/src/panels/information/informationpanel.cpp
+++ b/src/panels/information/informationpanel.cpp
@@ -46,13 +46,6 @@ InformationPanel::~InformationPanel()
 {
 }
 
-QSize InformationPanel::sizeHint() const
-{
-    QSize size = Panel::sizeHint();
-    size.setWidth(minimumSizeHint().width());
-    return size;
-}
-
 void InformationPanel::setSelection(const KFileItemList& selection)
 {
     if (!isVisible()) {

diff --git a/src/panels/information/informationpanel.h b/src/panels/information/informationpanel.h
index 58265f4b5c909984c24f9c26644767ce8b4cdea8..17f8003ac7317de974bb5b3fc2064c7e3bcdc472 100644 (file)
--- a/src/panels/information/informationpanel.h
+++ b/src/panels/information/informationpanel.h
@@ -35,9 +35,6 @@ public:
     explicit InformationPanel(QWidget* parent = 0);
     virtual ~InformationPanel();
 
-    /** @see QWidget::sizeHint() */
-    virtual QSize sizeHint() const;
-
 signals:
     void urlActivated(const KUrl& url);
 

diff --git a/src/panels/panel.cpp b/src/panels/panel.cpp
index e90970c6ee2c05666195cb1721e7de0961cdcdae..f26086159b4441573695ea80e5f636d456a3902e 100644 (file)
--- a/src/panels/panel.cpp
+++ b/src/panels/panel.cpp
@@ -47,6 +47,16 @@ QList<QAction*> Panel::customContextMenuActions() const
     return m_customContextMenuActions;
 }
 
+QSize Panel::sizeHint() const
+{
+    // The size hint will be requested already when starting Dolphin even
+    // if the panel is invisible. For performance reasons most panels delay
+    // the creation and initialization of widgets until a showEvent() is called.
+    // Because of this the size-hint of the embedded widgets cannot be used
+    // and a default size is provided:
+    return QSize(180, 180);
+}
+
 void Panel::setUrl(const KUrl& url)
 {
     if (url.equals(m_url, KUrl::CompareWithoutTrailingSlash)) {

diff --git a/src/panels/panel.h b/src/panels/panel.h
index 83ed3da3bb5b4677dead079fd04720ce627cd45f..2e8d46e409fd9fee98e6d58d9b0912efb5643256 100644 (file)
--- a/src/panels/panel.h
+++ b/src/panels/panel.h
@@ -50,6 +50,9 @@ public:
     void setCustomContextMenuActions(const QList<QAction*>& actions);
     QList<QAction*> customContextMenuActions() const;
 
+    /** @see QWidget::sizeHint() */
+    virtual QSize sizeHint() const;
+
 public slots:
     /**
      * This is invoked every time the folder being displayed in the

diff --git a/src/panels/terminal/terminalpanel.cpp b/src/panels/terminal/terminalpanel.cpp
index fc176837dc1adf57db3c3c4a46ba2f9211f7f8ea..3c9c5bd75820aecd0da9d2681b7975bb676aba28 100644 (file)
--- a/src/panels/terminal/terminalpanel.cpp
+++ b/src/panels/terminal/terminalpanel.cpp
@@ -46,13 +46,6 @@ TerminalPanel::~TerminalPanel()
 {
 }
 
-QSize TerminalPanel::sizeHint() const
-{
-    QSize size = Panel::sizeHint();
-    size.setHeight(200);
-    return size;
-}
-
 void TerminalPanel::terminalExited()
 {
     emit hideTerminalPanel();

diff --git a/src/panels/terminal/terminalpanel.h b/src/panels/terminal/terminalpanel.h
index b9508279ec94f58825b333ed27920b60158b0afe..831c97f32acbcb684df460ba1f9986b4345196ba 100644 (file)
--- a/src/panels/terminal/terminalpanel.h
+++ b/src/panels/terminal/terminalpanel.h
@@ -42,9 +42,6 @@ public:
     TerminalPanel(QWidget* parent = 0);
     virtual ~TerminalPanel();
 
-    /** @see QWidget::sizeHint() */
-    virtual QSize sizeHint() const;
-
 public slots:
     void terminalExited();