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

Help: Avoid double lookup for help tooltips

Browse Source 
Save the HelpItem directly in the tooltip instead of the help ID which
would need to be looked up again.

Change-Id: I107e82e89d9ea26cad9d6532ad4c687d1ac8f1ec
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Eike Ziller
2019-01-29 11:43:43 +01:00
parent 4e8c2c4b13
commit 32429e11c9
9 changed files with 67 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/libs/utils/tooltip/tips.cpp
View File

@@ -53,15 +53,15 @@ TipLabel::TipLabel(QWidget *parent) :
{
}
void TipLabel::setHelpId(const QString &id)
void TipLabel::setContextHelp(const QVariant &help)
{
m_helpId = id;
m_contextHelp = help;
update();
}
QString TipLabel::helpId() const
QVariant TipLabel::contextHelp() const
{
return m_helpId;
return m_contextHelp;
}
const QMetaObject *TipLabel::metaObject() const
@@ -113,9 +113,9 @@ bool ColorTip::canHandleContentReplacement(int typeId) const
return typeId == ToolTip::ColorContent;
}
bool ColorTip::equals(int typeId, const QVariant &other, const QString &otherHelpId) const
bool ColorTip::equals(int typeId, const QVariant &other, const QVariant &otherContextHelp) const
{
return typeId == ToolTip::ColorContent && otherHelpId == helpId() && other == m_color;
return typeId == ToolTip::ColorContent && otherContextHelp == contextHelp() && other == m_color;
}
void ColorTip::paintEvent(QPaintEvent *event)
@@ -165,7 +165,7 @@ bool TextTip::isInteractive() const
void TextTip::configure(const QPoint &pos, QWidget *w)
{
if (helpId().isEmpty())
if (contextHelp().isNull())
setText(m_text);
else
setText(QString::fromLatin1("<table><tr><td valign=middle>%1</td><td>&nbsp;&nbsp;"
@@ -201,9 +201,10 @@ int TextTip::showTime() const
return 10000 + 40 * qMax(0, m_text.size() - 100);
}
bool TextTip::equals(int typeId, const QVariant &other, const QString &otherHelpId) const
bool TextTip::equals(int typeId, const QVariant &other, const QVariant &otherContextHelp) const
{
return typeId == ToolTip::TextContent && otherHelpId == helpId() && other.toString() == m_text;
return typeId == ToolTip::TextContent && otherContextHelp == contextHelp()
&& other.toString() == m_text;
}
void TextTip::paintEvent(QPaintEvent *event)
@@ -280,9 +281,9 @@ bool WidgetTip::canHandleContentReplacement(int typeId) const
return false;
}
bool WidgetTip::equals(int typeId, const QVariant &other, const QString &otherHelpId) const
bool WidgetTip::equals(int typeId, const QVariant &other, const QVariant &otherContextHelp) const
{
return typeId == ToolTip::WidgetContent && otherHelpId == helpId()
return typeId == ToolTip::WidgetContent && otherContextHelp == contextHelp()
&& other.value<QWidget *>() == m_widget;
}