From 1a1d0e269dcf01b40afcf09214fa06d0e169fd11 Mon Sep 17 00:00:00 2001
From: kh1 <qt-info@nokia.com>
Date: Thu, 21 Jan 2010 18:08:07 +0100
Subject: [PATCH] Use HighlightAllOccurrences to have highlighting during type
and search.
Task-number: QTCREATORBUG-235
---
src/plugins/help/centralwidget.cpp | 6 +++++-
src/plugins/help/helpfindsupport.cpp | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/plugins/help/centralwidget.cpp b/src/plugins/help/centralwidget.cpp
index 67dbc09c652..2968d885bae 100644
--- a/src/plugins/help/centralwidget.cpp
+++ b/src/plugins/help/centralwidget.cpp
@@ -660,7 +660,11 @@ bool CentralWidget::find(const QString &txt, QTextDocument::FindFlags findFlags,
if (findFlags & QTextDocument::FindCaseSensitively)
options |= QWebPage::FindCaseSensitively;
- return viewer->findText(txt, options);
+ bool found = viewer->findText(txt, options);
+ options = QWebPage::HighlightAllOccurrences;
+ viewer->findText(QLatin1String(""), options); // clear first
+ viewer->findText(txt, options); // force highlighting of all other matches
+ return found;
}
return false;
#else
diff --git a/src/plugins/help/helpfindsupport.cpp b/src/plugins/help/helpfindsupport.cpp
index bfb688db571..879d2f2e0f1 100644
--- a/src/plugins/help/helpfindsupport.cpp
+++ b/src/plugins/help/helpfindsupport.cpp
@@ -132,7 +132,11 @@ bool HelpViewerFindSupport::find(const QString &txt, Find::IFindSupport::FindFla
if (findFlags & Find::IFindSupport::FindCaseSensitively)
options |= QWebPage::FindCaseSensitively;
- return m_viewer->findText(txt, options);
+ bool found = m_viewer->findText(txt, options);
+ options = QWebPage::HighlightAllOccurrences;
+ m_viewer->findText(QLatin1String(""), options); // clear first
+ m_viewer->findText(txt, options); // force highlighting of all other matches
+ return found;
#else
QTextCursor cursor = m_viewer->textCursor();
QTextDocument *doc = m_viewer->document();
--
GitLab