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

Fix regression in "Find Result" field due to Scintilla upgrade

Browse Source 
Fix #9595
pull/9607/head
Don HO 4 years ago
parent 5c884a80c6
commit 4b0010c4c3
No known key found for this signature in database
GPG Key ID: 6C429F1D8D84F46E
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File

7
PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp
Unescape View File

@ -3937,8 +3937,13 @@ void Finder::beginNewFilesSearch()
NativeLangSpeaker* pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker(); NativeLangSpeaker* pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker();
_prefixLineStr = pNativeSpeaker->getLocalizedStrFromID("find-result-line-prefix", TEXT("Line")); _prefixLineStr = pNativeSpeaker->getLocalizedStrFromID("find-result-line-prefix", TEXT("Line"));
// Use SCI_SETSEL(0, 0) instead of SCI_SETCURRENTPOS(0) to workaround
// an eventual regression or a change of behaviour in Scintilla 4.4.6
// ref: https://github.com/notepad-plus-plus/notepad-plus-plus/issues/9595#issuecomment-789824579
//
_scintView.execute(SCI_SETSEL, 0, 0);
//_scintView.execute(SCI_SETCURRENTPOS, 0);
_scintView.execute(SCI_SETCURRENTPOS, 0);
_pMainFoundInfos = _pMainFoundInfos == &_foundInfos1 ? &_foundInfos2 : &_foundInfos1; _pMainFoundInfos = _pMainFoundInfos == &_foundInfos1 ? &_foundInfos2 : &_foundInfos1;
_pMainMarkings = _pMainMarkings == &_markings1 ? &_markings2 : &_markings1; _pMainMarkings = _pMainMarkings == &_markings1 ? &_markings2 : &_markings1;
_nbFoundFiles = 0; _nbFoundFiles = 0;

Write Preview
Loading…
Cancel
Save