Merge pull request #1244 from RaiKoHoff/Dev_RC

Find/Replace: do mark occurrences on receiving focus again
This commit is contained in:
Rainer Kottenhoff 2019-05-25 22:47:27 +02:00 committed by GitHub
commit d0589dcf18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 7 deletions

View File

@ -1 +1 @@
1722
1723

View File

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.19.525.1722"
version="5.19.525.1723"
type="win32"
/>
<description>Notepad3 RC</description>

View File

@ -5348,16 +5348,13 @@ static INT_PTR CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wPara
s_InitialCaretPos = SciCall_GetCurrentPos();
s_InitialTopLine = SciCall_GetFirstVisibleLine();
}
if (!SciCall_IsSelectionEmpty()) {
EditEnsureSelectionVisible(Globals.hwndEdit);
}
bool const bEnableReplInSel = !(SciCall_IsSelectionEmpty() || SciCall_IsSelectionRectangle());
DialogEnableWindow(hwnd, IDC_REPLACEINSEL, bEnableReplInSel);
_DelayMarkAll(hwnd, 0, s_InitialSearchStart);
_DelayMarkAll(hwnd, 50, s_InitialSearchStart);
break;
default:

View File

@ -8,7 +8,7 @@
#define VERSION_MAJOR 5
#define VERSION_MINOR 19
#define VERSION_REV 525
#define VERSION_BUILD 1722
#define VERSION_BUILD 1723
#define SCINTILLA_VER 415+
#define ONIGMO_REGEX_VER 6.2.0
#define VERSION_PATCH RC