hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-27 19:24:08 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Extract ArticleView::highlightAllFtsOccurences()

Browse source 
Extracting this function allows to simplify the code and facilitates
optimizing it in the next commit.

Remove `#if QT_VERSION >= 0x040600` along the way as GoldenDict does not
support Qt versions older than 4.6 for several years now.
This commit is contained in:
Igor Kushnir 2022-05-22 22:12:30 +03:00
parent 9f5788ee11
commit bd5b36cac7
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
articleview.cc
View file

@ -2643,17 +2643,9 @@ void ArticleView::highlightFTSResults()
if( ftsSearchMatchCase ) if( ftsSearchMatchCase )
flags |= QWebPage::FindCaseSensitively; flags |= QWebPage::FindCaseSensitively;
#if QT_VERSION >= 0x040600
flags |= QWebPage::HighlightAllOccurrences;
for( int x = 0; x < allMatches.size(); x++ )
ui.definition->findText( allMatches.at( x ), flags );
flags &= ~QWebPage::HighlightAllOccurrences;
#endif
if( !allMatches.isEmpty() ) if( !allMatches.isEmpty() )
{ {
highlightAllFtsOccurences( flags );
if( ui.definition->findText( allMatches.at( 0 ), flags ) ) if( ui.definition->findText( allMatches.at( 0 ), flags ) )
{ {
ui.definition->page()->currentFrame()-> ui.definition->page()->currentFrame()->
@ -2669,6 +2661,13 @@ void ArticleView::highlightFTSResults()
ftsSearchIsOpened = true; ftsSearchIsOpened = true;
} }
void ArticleView::highlightAllFtsOccurences( QWebPage::FindFlags flags )
{
flags |= QWebPage::HighlightAllOccurrences;
for( int x = 0; x < allMatches.size(); x++ )
ui.definition->findText( allMatches.at( x ), flags );
}
void ArticleView::performFtsFindOperation( bool backwards ) void ArticleView::performFtsFindOperation( bool backwards )
{ {
if( !ftsSearchIsOpened ) if( !ftsSearchIsOpened )

1
articleview.hh
View file

@ -61,6 +61,7 @@ class ArticleView: public QFrame
int ftsPosition; int ftsPosition;
void highlightFTSResults(); void highlightFTSResults();
void highlightAllFtsOccurences( QWebPage::FindFlags flags );
void performFtsFindOperation( bool backwards ); void performFtsFindOperation( bool backwards );
public: public: