Update guiutil.cpp

awoland · awoland · commit cd3bd74f7b0d · 2014-01-05T12:57:35.000+03:00
Fix old bug in GUI with HtmlEscape(tooltip ...
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
@@ -258,11 +258,11 @@ bool ToolTipToRichTextFilter::eventFilter(QObject *obj, QEvent *evt)
     {
         QWidget *widget = static_cast<QWidget*>(obj);
         QString tooltip = widget->toolTip();
-        if(tooltip.size() > size_threshold && !tooltip.startsWith("<qt/>") && !Qt::mightBeRichText(tooltip))
+        if(tooltip.size() > size_threshold && !tooltip.startsWith("<qt>") && !Qt::mightBeRichText(tooltip))
         {
             // Prefix <qt/> to make sure Qt detects this as rich text
             // Escape the current message as HTML and replace \n by <br>
-            tooltip = "<qt/>" + HtmlEscape(tooltip, true);
+            tooltip = "<qt>" + HtmlEscape(tooltip, true) + "<qt/>";
             widget->setToolTip(tooltip);
             return true;
         }

Original file line number	Diff line number	Diff line change
`@@ -258,11 +258,11 @@ bool ToolTipToRichTextFilter::eventFilter(QObject obj, QEvent evt)`
`258`	`258`	`{`
`259`	`259`	`QWidget widget = static_cast<QWidget>(obj);`
`260`	`260`	`QString tooltip = widget->toolTip();`
`261`		`- if(tooltip.size() > size_threshold && !tooltip.startsWith("<qt/>") && !Qt::mightBeRichText(tooltip))`
	`261`	`+ if(tooltip.size() > size_threshold && !tooltip.startsWith("<qt>") && !Qt::mightBeRichText(tooltip))`
`262`	`262`	`{`
`263`	`263`	`// Prefix <qt/> to make sure Qt detects this as rich text`
`264`	`264`	`// Escape the current message as HTML and replace \n by <br>`
`265`		`- tooltip = "<qt/>" + HtmlEscape(tooltip, true);`
	`265`	`+ tooltip = "<qt>" + HtmlEscape(tooltip, true) + "<qt/>";`
`266`	`266`	`widget->setToolTip(tooltip);`
`267`	`267`	`return true;`
`268`	`268`	`}`