CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-11 21:03:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

+ fix: replace dialog: in case of selection: on "Replace" button pressed, next finding is selected (analog. to empty selection)

Browse Source
This commit is contained in:
Rainer Kottenhoff 2019-01-05 10:05:50 +01:00
parent 4e5174d159
commit c2cc099e03
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Edit.c
View File

@ -6097,14 +6097,17 @@ bool EditReplace(HWND hwnd, LPCEDITFINDREPLACE lpefr) {
if (!pszReplace)
return false; // recoding of clipboard canceled
DocPos const selBeg = SciCall_GetSelectionStart();
DocPos const selEnd = SciCall_GetSelectionEnd();
// redo find to get group ranges filled
DocPos start = (SciCall_IsSelectionEmpty() ? SciCall_GetCurrentPos() : SciCall_GetSelectionStart());
DocPos start = (SciCall_IsSelectionEmpty() ? SciCall_GetCurrentPos() : selBeg);
DocPos end = SciCall_GetTextLength();
DocPos _start = start;
g_iReplacedOccurrences = 0;
DocPos const iPos = _FindInTarget(hwnd, lpefr->szFind, (DocPos)StringCchLenA(lpefr->szFind, FRMOD_NORM),
(int)(lpefr->fuFlags), &start, &end, false, false);
DocPos const findLen = (DocPos)StringCchLenA(lpefr->szFind, 0);
DocPos const iPos = _FindInTarget(hwnd, lpefr->szFind, findLen, (int)(lpefr->fuFlags), &start, &end, false, FRMOD_NORM);
// w/o selection, replacement string is put into current position
// but this maybe not intended here
@ -6119,17 +6122,21 @@ bool EditReplace(HWND hwnd, LPCEDITFINDREPLACE lpefr) {
return true;
}
}
g_iReplacedOccurrences = 1;
// if selection is is not equal current find, set selection
else if ((selBeg != start) || (selEnd != end)) {
FreeMem(pszReplace);
SciCall_SetCurrentPos(selBeg);
return EditFindNext(hwnd, lpefr, false, false);
}
_ENTER_TARGET_TRANSACTION_;
SciCall_TargetFromSelection();
Sci_ReplaceTarget(iReplaceMsg, -1, pszReplace);
g_iReplacedOccurrences = 1;
// move caret behind replacement
DocPos const after = SciCall_GetTargetEnd();
SciCall_SetSel(after, after);
SciCall_SetCurrentPos(SciCall_GetTargetEnd());
_LEAVE_TARGET_TRANSACTION_;