Commit d9b111b0 authored by Fabio D'Urso's avatar Fabio D'Urso
Browse files

dolphin: Escape text in statusbar tooltip

This fixes the same issue as 4450f844,
but for the status bar's tooltip text.

BUG: 323170
FIXED-IN: 4.11.0
REVIEW: 111836
parent 7eec9274
......@@ -34,6 +34,7 @@
#include <QHBoxLayout>
#include <QLabel>
#include <QProgressBar>
#include <QTextDocument>
#include <QToolButton>
#include <QTime>
#include <QTimer>
......@@ -324,10 +325,17 @@ void DolphinStatusBar::updateLabelText()
{
const QString text = m_text.isEmpty() ? m_defaultText : m_text;
// Set status bar text and elide it if too long
QFontMetrics fontMetrics(m_label->font());
const QString elidedText = fontMetrics.elidedText(text, Qt::ElideRight, m_label->width());
m_label->setText(elidedText);
m_label->setToolTip(text == elidedText ? QString() : text);
// If the text has been elided, set the original text as tooltip
if (text != elidedText) {
m_label->setToolTip(Qt::convertFromPlainText(text));
} else {
m_label->setToolTip(QString());
}
}
void DolphinStatusBar::slotResetToDefaultText()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment