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

+ fix: Occurrences Counter

Browse Source
This commit is contained in:
Rainer Kottenhoff 2019-05-25 21:11:13 +02:00
parent 98d2e063e8
commit 2bcd7eec67
4 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Versions/build.txt
View File

@ -1 +1 @@
1721
1722

2
res/Notepad3.exe.manifest.conf
View File

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

22
src/Edit.c
View File

@ -6139,7 +6139,6 @@ void EditMarkAllOccurrences(HWND hwnd, bool bForceClear)
if (!IsMarkOccurrencesEnabled()) {
EditClearAllOccurrenceMarkers(hwnd);
Globals.iMarkOccurrencesCount = -1;
return;
}
@ -6450,19 +6449,17 @@ bool EditReplaceAllInSelection(HWND hwnd, LPCEDITFINDREPLACE lpefr, bool bShowIn
void EditClearAllOccurrenceMarkers(HWND hwnd)
{
UNUSED(hwnd);
if (Globals.iMarkOccurrencesCount > 0)
{
Globals.iMarkOccurrencesCount = IsMarkOccurrencesEnabled() ? 0 : -1;
_IGNORE_NOTIFY_CHANGE_;
Globals.iMarkOccurrencesCount = IsMarkOccurrencesEnabled() ? 0 : -1;
SciCall_SetIndicatorCurrent(INDIC_NP3_MARK_OCCURANCE);
SciCall_IndicatorClearRange(0, Sci_GetDocEndPosition());
SciCall_SetIndicatorCurrent(INDIC_NP3_FOCUS_VIEW);
SciCall_IndicatorClearRange(0, Sci_GetDocEndPosition());
_OBSERVE_NOTIFY_CHANGE_;
}
_IGNORE_NOTIFY_CHANGE_;
SciCall_SetIndicatorCurrent(INDIC_NP3_MARK_OCCURANCE);
SciCall_IndicatorClearRange(0, Sci_GetDocEndPosition());
SciCall_SetIndicatorCurrent(INDIC_NP3_FOCUS_VIEW);
SciCall_IndicatorClearRange(0, Sci_GetDocEndPosition());
_OBSERVE_NOTIFY_CHANGE_;
}
@ -6574,7 +6571,6 @@ void EditMarkAll(HWND hwnd, char* pszFind, int flags, DocPos rangeStart, DocPos
DocPos start = rangeStart;
DocPos end = rangeEnd;
Globals.iMarkOccurrencesCount = 0;
DocPos iPos = (DocPos)-1;
do {

2
src/VersionEx.h
View File

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