fixed issue that the zoom slider might not have enough vertical space when having...

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

diff --git a/src/dolphinstatusbar.cpp b/src/dolphinstatusbar.cpp
index 8a2d82d37418112065e013e08bf20cfd059bea0b..00c2500b160bd0a005db10a13bb31cd3218086e6 100644 (file)
--- a/src/dolphinstatusbar.cpp
+++ b/src/dolphinstatusbar.cpp
@@ -104,11 +104,12 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent, DolphinView* view) :
     m_progressBar->hide();
 
     // initialize sizes
-    const int contentHeight = QFontMetrics(m_messageLabel->font()).height() + 4;
-    const int barHeight = contentHeight + 4;
+    const int fontHeight = QFontMetrics(m_messageLabel->font()).height();
+    const int zoomWidgetHeight = m_zoomWidget->minimumSizeHint().height();
+    const int contentHeight = (fontHeight < zoomWidgetHeight) ? zoomWidgetHeight : fontHeight;
 
-    setMinimumHeight(barHeight);
-    m_messageLabel->setMinimumTextHeight(barHeight);
+    m_messageLabel->setMinimumTextHeight(fontHeight);
+    m_messageLabel->setMinimumTextHeight(contentHeight);
     m_spaceInfo->setFixedHeight(contentHeight);
     m_progressBar->setFixedSize(200, contentHeight);
     m_zoomWidget->setFixedSize(150, contentHeight);