tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a fording perf issue in Search result windows 

Ref:
https://github.com/notepad-plus-plus/notepad-plus-plus/issues/11814#issuecomment-1174732649

Fix #11814
This commit is contained in:
Don Ho 2022-07-05 19:43:16 +02:00
parent 2a7552c882
commit 0b5785cbec
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp
View File

@ -2960,11 +2960,14 @@ void FindReplaceDlg::findAllIn(InWhat op)
_pFinder->_scintView.setMakerStyle(FOLDER_STYLE_SIMPLE);
_pFinder->_scintView.display();
_pFinder->setFinderStyle();
_pFinder->display(false);
::UpdateWindow(_hParent);
justCreated = true;
}
_pFinder->setFinderStyle();
if (_pFinder->_purgeBeforeEverySearch)
{
_pFinder->removeAll();
@ -4573,9 +4576,8 @@ void Finder::beginNewFilesSearch()
_pMainMarkings = _pMainMarkings == &_markings1 ? &_markings2 : &_markings1;
_nbFoundFiles = 0;
// fold all old searches (1st level only)
// 2022/06/18: Due to performance issue on Scintilla 5.x, the following line is commented:
//_scintView.collapse(searchHeaderLevel - SC_FOLDLEVELBASE, fold_collapse);
if (_scintView.execute(SCI_GETFOLDEXPANDED, 0))
_scintView.execute(SCI_TOGGLEFOLD, 0);
}
void Finder::finishFilesSearch(int count, int searchedCount, bool isMatchLines, bool searchedEntireNotSelection)

4
PowerEditor/src/ScintillaComponent/ScintillaEditView.h
View File

@ -946,6 +946,10 @@ protected:
//--------------------
void setSearchResultLexer() {
if (execute(SCI_GETLEXER) == SCLEX_SEARCHRESULT)
{
return;
}
execute(SCI_STYLESETEOLFILLED, SCE_SEARCHRESULT_FILE_HEADER, true);
execute(SCI_STYLESETEOLFILLED, SCE_SEARCHRESULT_SEARCH_HEADER, true);
setLexer(L_SEARCHRESULT, LIST_NONE);