From 96a48a2fae143970fb9cb808838ba32b4a94bbe3 Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Sat, 25 May 2019 22:35:25 +0200 Subject: [PATCH] + fix: initialt mark occ, if Find/Replace dialog receives focus again --- Versions/build.txt | 2 +- res/Notepad3.exe.manifest.conf | 2 +- src/Edit.c | 5 +---- src/VersionEx.h | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Versions/build.txt b/Versions/build.txt index ad0b314c2..9b5f360cc 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -1722 +1723 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index efbe16042..4d5ad0d4c 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 RC diff --git a/src/Edit.c b/src/Edit.c index 2b57e86f1..954efb7d2 100644 --- a/src/Edit.c +++ b/src/Edit.c @@ -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: diff --git a/src/VersionEx.h b/src/VersionEx.h index b86c8738b..36e65b357 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -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