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

opt: erase the need to use extra variable to hold the ftsSearchPanel state

Browse source
This commit is contained in:
Xiao Yi Fang 2024-06-14 17:36:05 +08:00
parent 39b207fa78
commit 585d547d28
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/ui/articleview.cc
View file

@ -607,7 +607,7 @@ bool ArticleView::handleF3( QObject * /*obj*/, QEvent * ev )
return true;
}
}
if ( ke->key() == Qt::Key_F3 && ftsSearchIsOpened ) {
if ( ke->key() == Qt::Key_F3 && ftsSearchPanel->isVisible() ) {
if ( !ke->modifiers() ) {
if ( ev->type() == QEvent::KeyPress )
on_ftsSearchNext_clicked();
@ -1930,7 +1930,7 @@ void ArticleView::openSearch()
if ( !isVisible() )
return;
if ( ftsSearchIsOpened )
if ( ftsSearchPanel->isVisible() )
closeSearch();
if ( !searchPanel->isVisible() ) {
@ -2070,10 +2070,9 @@ bool ArticleView::closeSearch()
return true;
}
else if ( ftsSearchIsOpened ) {
if ( ftsSearchPanel->isVisible() ) {
firstAvailableText.clear();
uniqueMatches.clear();
ftsSearchIsOpened = false;
ftsSearchPanel->hide();
webview->setFocus();
@ -2084,8 +2083,7 @@ bool ArticleView::closeSearch()
return true;
}
else
return false;
return false;
}
bool ArticleView::isSearchOpened()
@ -2156,7 +2154,7 @@ void ArticleView::dictionaryClear( const ActiveDictIds & ad )
void ArticleView::performFtsFindOperation( bool backwards )
{
if ( !ftsSearchIsOpened )
if ( !ftsSearchPanel->isVisible() )
return;
if ( firstAvailableText.isEmpty() ) {

2
src/ui/articleview.hh
View file

@ -84,7 +84,7 @@ class ArticleView: public QWidget
/// Search in results of full-text search
QString firstAvailableText;
QStringList uniqueMatches;
bool ftsSearchIsOpened = false;
bool ftsSearchMatchCase = false;
QString delayedHighlightText;