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

Show wrap indicator also for searches in help views.

Browse Source 
Task-number: QTCREATORBUG-2753
This commit is contained in:
con
2011-01-14 11:19:57 +01:00
parent ebb9e25277
commit 7915ce6bd3
6 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/help/helpfindsupport.cpp
View File

@@ -75,16 +75,24 @@ QString HelpFindSupport::completedFindString() const
Find::IFindSupport::Result HelpFindSupport::findIncremental(const QString &txt,
Find::FindFlags findFlags)
{
QTC_ASSERT(m_centralWidget, return NotFound);
findFlags &= ~Find::FindBackward;
return m_centralWidget->find(txt, findFlags, true) ? Found : NotFound;
return find(txt, findFlags, true) ? Found : NotFound;
}
Find::IFindSupport::Result HelpFindSupport::findStep(const QString &txt,
Find::FindFlags findFlags)
{
QTC_ASSERT(m_centralWidget, return NotFound);
return m_centralWidget->find(txt, findFlags, false) ? Found : NotFound;
return find(txt, findFlags, false) ? Found : NotFound;
}
bool HelpFindSupport::find(const QString &txt, Find::FindFlags findFlags, bool incremental)
{
QTC_ASSERT(m_centralWidget, return false);
bool wrapped = false;
bool found = m_centralWidget->find(txt, findFlags, incremental, &wrapped);
if (wrapped)
showWrapIndicator(m_centralWidget);
return found;
}
// -- HelpViewerFindSupport
@@ -125,5 +133,9 @@ bool HelpViewerFindSupport::find(const QString &txt,
Find::FindFlags findFlags, bool incremental)
{
QTC_ASSERT(m_viewer, return false);
return m_viewer->findText(txt, findFlags, incremental, false);
bool wrapped = false;
bool found = m_viewer->findText(txt, findFlags, incremental, false, &wrapped);
if (wrapped)
showWrapIndicator(m_viewer);
return found;
}