+fix: FocusView preserved on closing Find/Replacce dialog (add missing checks)

This commit is contained in:
Rainer Kottenhoff 2019-05-26 18:17:35 +02:00
parent f07a052ac0
commit c51458558b
4 changed files with 9 additions and 4 deletions

View File

@ -1 +1 @@
1726
1727

View File

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

View File

@ -5260,8 +5260,13 @@ static INT_PTR CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wPara
// check if we had to revert FocusedView
if (FocusedView.HideNonMatchedLines) {
if (!IsMarkOccurrencesEnabled() ||
SciCall_IsSelectionEmpty() ||
Settings.MarkOccurrencesMatchVisible ||
(Settings.MarkOccurrencesMatchWholeWords != IsButtonChecked(hwnd, IDC_FINDWORD)))
IsButtonChecked(hwnd, IDC_FINDSTART) ||
IsButtonChecked(hwnd, IDC_FINDREGEXP) ||
IsButtonChecked(hwnd, IDC_WILDCARDSEARCH) ||
(Settings.MarkOccurrencesMatchWholeWords != IsButtonChecked(hwnd, IDC_FINDWORD)) ||
(Settings.MarkOccurrencesMatchCase != IsButtonChecked(hwnd, IDC_FINDCASE)))
{
EditToggleView(sg_pefrData->hwnd);
}

View File

@ -8,7 +8,7 @@
#define VERSION_MAJOR 5
#define VERSION_MINOR 19
#define VERSION_REV 526
#define VERSION_BUILD 1726
#define VERSION_BUILD 1727
#define SCINTILLA_VER 415+
#define ONIGMO_REGEX_VER 6.2.0
#define VERSION_PATCH RC