[DolphinStatusBar] Fix free space info height with bigger fonts

[dolphin.git] / src / statusbar / dolphinstatusbar.cpp

diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp
index b3fddba10825ba58164d183d405f5e43cb501bd8..a7585bed023632e3dadaa39c1e96e0369f0f2c7b 100644 (file)
--- a/src/statusbar/dolphinstatusbar.cpp
+++ b/src/statusbar/dolphinstatusbar.cpp
@@ -39,7 +39,7 @@
 #include <QToolButton>
 
 namespace {
 #include <QToolButton>
 
 namespace {

-    const int ResetToDefaultTimeout = 1000;
+    const int UpdateDelay = 50;

 }
 
 DolphinStatusBar::DolphinStatusBar(QWidget* parent) :
 }
 
 DolphinStatusBar::DolphinStatusBar(QWidget* parent) :


@@ -53,7 +53,7 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) :
     m_stopButton(nullptr),
     m_progress(100),
     m_showProgressBarTimer(nullptr),
     m_stopButton(nullptr),
     m_progress(100),
     m_showProgressBarTimer(nullptr),

-    m_resetToDefaultTextTimer(nullptr),
+    m_delayUpdateTimer(nullptr),

     m_textTimestamp()
 {
     // Initialize text label
     m_textTimestamp()
 {
     // Initialize text label


@@ -95,10 +95,12 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) :
     m_showProgressBarTimer->setSingleShot(true);
     connect(m_showProgressBarTimer, &QTimer::timeout, this, &DolphinStatusBar::updateProgressInfo);
 
     m_showProgressBarTimer->setSingleShot(true);
     connect(m_showProgressBarTimer, &QTimer::timeout, this, &DolphinStatusBar::updateProgressInfo);
 

-    m_resetToDefaultTextTimer = new QTimer(this);
-    m_resetToDefaultTextTimer->setInterval(ResetToDefaultTimeout);
-    m_resetToDefaultTextTimer->setSingleShot(true);
-    connect(m_resetToDefaultTextTimer, &QTimer::timeout, this, &DolphinStatusBar::slotResetToDefaultText);
+    // initialize text updater delay timer
+    m_delayUpdateTimer = new QTimer(this);
+    m_delayUpdateTimer->setInterval(UpdateDelay);
+    m_delayUpdateTimer->setSingleShot(true);
+    connect(m_delayUpdateTimer, &QTimer::timeout,
+            this, &DolphinStatusBar::updateLabelText);

 
     // Initialize top layout and size policies
     const int fontHeight = QFontMetrics(m_label->font()).height();
 
     // Initialize top layout and size policies
     const int fontHeight = QFontMetrics(m_label->font()).height();


@@ -113,7 +115,7 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) :
 
     m_zoomSlider->setMaximumWidth(fontMetrics.averageCharWidth() * 25);
 
 
     m_zoomSlider->setMaximumWidth(fontMetrics.averageCharWidth() * 25);
 

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

     m_spaceInfo->setMaximumWidth(fontMetrics.averageCharWidth() * 25);
     m_spaceInfo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 
     m_spaceInfo->setMaximumWidth(fontMetrics.averageCharWidth() * 25);
     m_spaceInfo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 


@@ -131,6 +133,15 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) :
     topLayout->addWidget(m_progressBar);
 
     setExtensionsVisible(true);
     topLayout->addWidget(m_progressBar);
 
     setExtensionsVisible(true);

+    setWhatsThis(xi18nc("@info:whatsthis Statusbar", "<para>This is "
+        "the <emphasis>Statusbar</emphasis>. It contains three elements "
+        "by default (left to right):<list><item>A <emphasis>text field"
+        "</emphasis> that displays the size of selected items. If only "
+        "one item is selected the name and type is shown as well.</item>"
+        "<item>A <emphasis>zoom slider</emphasis> that allows you "
+        "to adjust the size of the icons in the view.</item>"
+        "<item><emphasis>Space information</emphasis> about the "
+        "current storage device.</item></list></para>"));

 }
 
 DolphinStatusBar::~DolphinStatusBar()
 }
 
 DolphinStatusBar::~DolphinStatusBar()


@@ -145,19 +156,9 @@ void DolphinStatusBar::setText(const QString& text)
 
     m_textTimestamp = QTime::currentTime();
 
 
     m_textTimestamp = QTime::currentTime();
 

-    if (text.isEmpty()) {
-        // Assure that the previous set text won't get
-        // cleared immediatelly.
-        m_resetToDefaultTextTimer->start();
-    } else {
-        m_text = text;
-
-        if (m_resetToDefaultTextTimer->isActive()) {
-            m_resetToDefaultTextTimer->start();
-        }
-
-        updateLabelText();
-    }
+    m_text = text;
+    // will update status bar text in 50ms
+    m_delayUpdateTimer->start();

 }
 
 QString DolphinStatusBar::text() const
 }
 
 QString DolphinStatusBar::text() const


@@ -205,12 +206,13 @@ int DolphinStatusBar::progress() const
 
 void DolphinStatusBar::resetToDefaultText()
 {
 
 void DolphinStatusBar::resetToDefaultText()
 {

+    m_text.clear();
+

     QTime currentTime;
     QTime currentTime;

-    if (currentTime.msecsTo(m_textTimestamp) < ResetToDefaultTimeout) {
-        m_resetToDefaultTextTimer->start();
+    if (currentTime.msecsTo(m_textTimestamp) < UpdateDelay) {
+        m_delayUpdateTimer->start();

     } else {
     } else {

-        m_resetToDefaultTextTimer->stop();
-        slotResetToDefaultText();
+        updateLabelText();

     }
 }
 
     }
 }
 


@@ -259,7 +261,7 @@ void DolphinStatusBar::updateSpaceInfo()
 
 void DolphinStatusBar::contextMenuEvent(QContextMenuEvent* event)
 {
 
 void DolphinStatusBar::contextMenuEvent(QContextMenuEvent* event)
 {

-    Q_UNUSED(event);
+    Q_UNUSED(event)

 
     QMenu menu(this);
 
 
     QMenu menu(this);
 


@@ -316,12 +318,6 @@ void DolphinStatusBar::updateLabelText()
     m_label->setText(text);
 }
 
     m_label->setText(text);
 }
 

-void DolphinStatusBar::slotResetToDefaultText()
-{
-    m_text.clear();
-    updateLabelText();
-}
-

 void DolphinStatusBar::updateZoomSliderToolTip(int zoomLevel)
 {
     const int size = ZoomLevelInfo::iconSizeForZoomLevel(zoomLevel);
 void DolphinStatusBar::updateZoomSliderToolTip(int zoomLevel)
 {
     const int size = ZoomLevelInfo::iconSizeForZoomLevel(zoomLevel);