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

Merge pull request #1660 from RaiKoHoff/DevNewFeatures

Browse Source 
Scintilla patches for auto-completion navigation
This commit is contained in:
Rainer Kottenhoff 2019-09-20 16:53:31 +02:00 committed by GitHub
commit 98be193abc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Versions/build.txt
View File

@ -1 +1 @@
2643
2644

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

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.19.919.2643"
version="5.19.920.2644"
type="win32"
/>
<description>Notepad3 BETA</description>

2
scintilla/src/AutoComplete.cxx
View File

@ -218,10 +218,12 @@ void AutoComplete::Move(int delta) {
const int count = lb->Length();
int current = lb->GetSelection();
current += delta;
// >>>>>>>>>>>>>>> BEG NON STD SCI PATCH >>>>>>>>>>>>>>>
if (current >= count)
current = (current == count ? 0 : count - 1);
if (current < 0)
current = (current == -1 ? count - 1 : 0);
// <<<<<<<<<<<<<<< END NON STD SCI PATCH <<<<<<<<<<<<<<<
lb->Select(current);
}

9
scintilla/src/ScintillaBase.cxx
View File

@ -157,12 +157,17 @@ int ScintillaBase::KeyCommand(unsigned int iMessage) {
case SCI_PAGEUP:
AutoCompleteMove(-ac.lb->GetVisibleRows());
return 0;
// >>>>>>>>>>>>>>> BEG NON STD SCI PATCH >>>>>>>>>>>>>>>
case SCI_VCHOME:
AutoCompleteMove(-5000);
case SCI_HOMEWRAP:
case SCI_VCHOMEWRAP:
AutoCompleteMove(-10000);
return 0;
case SCI_LINEEND:
AutoCompleteMove(5000);
case SCI_LINEENDWRAP:
AutoCompleteMove(10000);
return 0;
// <<<<<<<<<<<<<<< END NON STD SCI PATCH <<<<<<<<<<<<<<<
case SCI_DELETEBACK:
DelCharBack(true);
AutoCompleteCharacterDeleted();

3
src/Edit.c
View File

@ -7066,10 +7066,11 @@ bool EditAutoCompleteWord(HWND hwnd, bool autoInsert)
// cppcheck-suppress constArgument
SciCall_AutoCSetSeperator(sep[0]);
SciCall_AutoCSetIgnoreCase(true);
//SendMessage(hwnd, SCI_AUTOCSETCASEINSENSITIVEBEHAVIOUR, (WPARAM)SC_CASEINSENSITIVEBEHAVIOUR_IGNORECASE, 0);
//~SciCall_AutoCSetCaseInsensitiveBehaviour(SC_CASEINSENSITIVEBEHAVIOUR_IGNORECASE);
SciCall_AutoCSetChooseSingle(autoInsert);
//~SciCall_AutoCSetOrder(SC_ORDER_PERFORMSORT); // already sorted
SciCall_AutoCSetFillups(AutoCompleteFillUpChars);
//~SciCall_AutoCSetMulti(SC_MULTIAUTOC_EACH);
++iWListSize; // zero termination
char* const pList = AllocMem(iWListSize, HEAP_ZERO_MEMORY);

2
src/SciCall.h
View File

@ -317,10 +317,12 @@ DeclareSciCallR0(AutoCActive, AUTOCACTIVE, bool)
DeclareSciCallV0(AutoCComplete, AUTOCCOMPLETE)
DeclareSciCallV0(AutoCCancel, AUTOCCANCEL)
DeclareSciCallV1(AutoCSetIgnoreCase, AUTOCSETIGNORECASE, bool, flag)
DeclareSciCallV1(AutoCSetCaseInsensitiveBehaviour, AUTOCSETCASEINSENSITIVEBEHAVIOUR, int, options)
DeclareSciCallV1(AutoCSetSeperator, AUTOCSETSEPARATOR, char, seperator)
DeclareSciCallV01(AutoCSetFillups, AUTOCSETFILLUPS, const char*, text)
DeclareSciCallV1(AutoCSetChooseSingle, AUTOCSETCHOOSESINGLE, bool, flag)
DeclareSciCallV1(AutoCSetOrder, AUTOCSETORDER, int, options)
DeclareSciCallV1(AutoCSetMulti, AUTOCSETMULTI, int, options)
DeclareSciCallV2(AutoCShow, AUTOCSHOW, DocPos, len, const char*, list)

4
src/VersionEx.h
View File

@ -7,8 +7,8 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 19
#define VERSION_REV 919
#define VERSION_BUILD 2643
#define VERSION_REV 920
#define VERSION_BUILD 2644
#define SCINTILLA_VER 420
#define ONIGURUMA_REGEX_VER 6.9.3
#define UCHARDET_VER 2018.09.27