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 #479 from RaiKoHoff/Bugfixes_RC2_V

Browse Source 
+ fix: bug, where styling stopped after hotspot highlighting
This commit is contained in:
Derick Payne 2018-05-06 18:53:23 +02:00 committed by GitHub
commit f25db39bb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/Edit.c
View File

@ -5250,7 +5250,6 @@ INT_PTR CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wParam,LPARA
_IGNORE_NOTIFY_CHANGE_;
if (EditToggleView(g_hwndEdit, false)) { _DeleteLineStateAll(LINESTATE_OCCURRENCE_MARK); }
StringCchCopyA(g_lastFind, COUNTOF(g_lastFind), sg_pefrData->szFind);
g_iMarkOccurrencesCount = 0;
RegExResult_t match = _FindHasMatch(g_hwndEdit, sg_pefrData, (sg_pefrData->bMarkOccurences), false);
if (regexMatch != match) {
regexMatch = match;
@ -6689,6 +6688,7 @@ static bool __fastcall _HighlightIfBrace(HWND hwnd, DocPos iPos)
//=============================================================================
//
// EditApplyLexerStyle()
// if iRangeEnd == -1 : apply style from iRangeStart to document end
//
void EditApplyLexerStyle(HWND hwnd, DocPos iRangeStart, DocPos iRangeEnd)
{
@ -6703,20 +6703,33 @@ void EditApplyLexerStyle(HWND hwnd, DocPos iRangeStart, DocPos iRangeEnd)
//
void EditFinalizeStyling(HWND hwnd, DocPos iEndPos)
{
if (iEndPos <= 0) {
iEndPos = Sci_GetDocEndPosition();
}
DocPos const iEndStyled = SciCall_GetEndStyled();
if (iEndStyled < iEndPos)
if ((iEndPos < 0) || (iEndStyled < iEndPos))
{
DocLn const iStartLine = SciCall_LineFromPosition(iEndStyled) + 1;
DocPos const iStartStyling = SciCall_PositionFromLine(iStartLine);
EditApplyLexerStyle(hwnd, iStartStyling, iEndPos);
EditApplyLexerStyle(hwnd, iEndStyled, iEndPos);
}
}
//void EditFinalizeStyling(HWND hwnd, DocPos iEndPos)
//{
// if (iEndPos <= 0) {
// iEndPos = Sci_GetDocEndPosition();
// }
//
// DocPos const iEndStyled = SciCall_GetEndStyled();
//
// if (iEndStyled < iEndPos)
// {
// DocLn const iStartLine = SciCall_LineFromPosition(iEndStyled) + 1;
// DocPos const iStartStyling = SciCall_PositionFromLine(iStartLine);
// EditApplyLexerStyle(hwnd, iStartStyling, iEndPos);
// }
//}
//
//=============================================================================
//

9
src/Notepad3.c
View File

@ -1440,7 +1440,8 @@ static void __fastcall _InitializeSciEditCtrl(HWND hwndEditCtrl)
// SC_PERFORMED_UNDO, SC_PERFORMED_REDO, SC_MULTISTEPUNDOREDO, SC_LASTSTEPINUNDOREDO, SC_MOD_CHANGEMARKER,
// SC_MOD_BEFOREINSERT, SC_MOD_BEFOREDELETE, SC_MULTILINEUNDOREDO, and SC_MODEVENTMASKALL.
//
int const evtMask1 = SC_MOD_CONTAINER | SC_PERFORMED_USER | SC_PERFORMED_UNDO | SC_PERFORMED_REDO | SC_MOD_CHANGESTYLE;
///~ Don't use: SC_PERFORMED_USER | SC_MOD_CHANGESTYLE;
int const evtMask1 = SC_MOD_CONTAINER | SC_PERFORMED_UNDO | SC_PERFORMED_REDO;
int const evtMask2 = SC_MOD_INSERTTEXT | SC_MOD_DELETETEXT | SC_MOD_BEFOREINSERT | SC_MOD_BEFOREDELETE;
SendMessage(hwndEditCtrl, SCI_SETMODEVENTMASK, (WPARAM)(evtMask1 | evtMask2), 0);
@ -5770,12 +5771,6 @@ LRESULT MsgNotify(HWND hwnd,WPARAM wParam,LPARAM lParam)
RestoreAction(scn->token, REDO);
}
}
else if (iModType & SC_MOD_CHANGESTYLE) {
const DocPos iStartPos = (DocPos)scn->position;
const DocPos iEndPos = (DocPos)(scn->position + scn->length);
EditUpdateUrlHotspots(g_hwndEdit, iStartPos, iEndPos, g_bHyperlinkHotspot);
bModified = false; // not yet
}
if (bModified) {
if (g_iMarkOccurrences > 0) {
MarkAllOccurrences(iUpdateDelayMarkAllCoccurrences, true);