Fixes display issues of Dolphin statusbar widgets when a high DPI value is used ...

BUG: 334271
REVIEW: 119701
FIXED-IN: 4.14.1

diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp
index 169395e633b4d8b968de1b14ae49b62d6830f7b6..282d385ca407987183e221c7cf43679fa2602560 100644 (file)
--- a/src/statusbar/dolphinstatusbar.cpp
+++ b/src/statusbar/dolphinstatusbar.cpp
@@ -109,18 +109,19 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) :
     const int zoomSliderHeight = m_zoomSlider->minimumSizeHint().height();
     const int contentHeight = qMax(fontHeight, zoomSliderHeight);
 
     const int zoomSliderHeight = m_zoomSlider->minimumSizeHint().height();
     const int contentHeight = qMax(fontHeight, zoomSliderHeight);
 

+    QFontMetrics fontMetrics(m_label->font());
+

     m_label->setFixedHeight(contentHeight);
     m_label->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 
     m_label->setFixedHeight(contentHeight);
     m_label->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 

-    m_zoomSlider->setFixedHeight(contentHeight);
-    m_zoomSlider->setMaximumWidth(150);
+    m_zoomSlider->setMaximumWidth(fontMetrics.averageCharWidth() * 15);

 
     m_spaceInfo->setFixedHeight(contentHeight);
 
     m_spaceInfo->setFixedHeight(contentHeight);

-    m_spaceInfo->setMaximumWidth(150);
+    m_spaceInfo->setMaximumWidth(fontMetrics.averageCharWidth() * 15);

     m_spaceInfo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 
     m_progressBar->setFixedHeight(contentHeight);
     m_spaceInfo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 
     m_progressBar->setFixedHeight(contentHeight);

-    m_progressBar->setMaximumWidth(150);
+    m_progressBar->setMaximumWidth(fontMetrics.averageCharWidth() * 15);

 
     QHBoxLayout* topLayout = new QHBoxLayout(this);
     topLayout->setMargin(0);
 
     QHBoxLayout* topLayout = new QHBoxLayout(this);
     topLayout->setMargin(0);