feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Avoid line breaks in variable chooser tooltip

Browse Source 
By wrapping the html into a div with style="white-space:pre".

Task-number: QTCREATORBUG-27553
Change-Id: Ie8c4dcbe48d714fe72949afb841e5b4844e12cd1
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Alessandro Portale
2022-05-16 22:28:11 +02:00
parent 0b6bc0d187
commit 55615e83f5
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/libs/utils/variablechooser.cpp
View File

@@ -54,7 +54,8 @@ namespace Internal {
enum { enum {
UnexpandedTextRole = Qt::UserRole, UnexpandedTextRole = Qt::UserRole,
ExpandedTextRole ExpandedTextRole,
CurrentValueDisplayRole
}; };
class VariableTreeView : public QTreeView class VariableTreeView : public QTreeView
@@ -197,11 +198,8 @@ public:
} }
if (role == Qt::ToolTipRole) { if (role == Qt::ToolTipRole) {
QString description = m_expander->variableDescription(m_variable); return QString::fromLatin1("<div style=\"white-space:pre\">%1</div>")
const QString value = m_expander->value(m_variable).toHtmlEscaped(); .arg(data(column, CurrentValueDisplayRole).toString());
if (!value.isEmpty())
description += QLatin1String("<p>") + VariableChooser::tr("Current Value: %1").arg(value);
return description;
} }
if (role == UnexpandedTextRole) if (role == UnexpandedTextRole)
@@ -210,6 +208,15 @@ public:
if (role == ExpandedTextRole) if (role == ExpandedTextRole)
return m_expander->expand(QString::fromUtf8("%{" + m_variable + '}')); return m_expander->expand(QString::fromUtf8("%{" + m_variable + '}'));
if (role == CurrentValueDisplayRole) {
QString description = m_expander->variableDescription(m_variable);
const QString value = m_expander->value(m_variable).toHtmlEscaped();
if (!value.isEmpty())
description += QLatin1String("<p>")
+ VariableChooser::tr("Current Value: %1").arg(value);
return description;
}
return QVariant(); return QVariant();
} }
@@ -451,7 +458,7 @@ void VariableChooserPrivate::updateDescription(const QModelIndex &index)
{ {
if (m_variableDescription) if (m_variableDescription)
m_variableDescription->setText(m_model.data(m_sortModel->mapToSource(index), m_variableDescription->setText(m_model.data(m_sortModel->mapToSource(index),
Qt::ToolTipRole).toString()); CurrentValueDisplayRole).toString());
} }
/*! /*!