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: preserve styling in "Focused View" (Hyperlink styling gets lost?)

Browse Source
This commit is contained in:
Rainer Kottenhoff 2019-05-02 22:09:59 +02:00
parent e3699b1304
commit 21cdc6d3e6
7 changed files with 15 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Versions/build.txt
View File

@ -1 +1 @@
1686
1687

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

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

59
src/Edit.c
View File

@ -5510,8 +5510,8 @@ static INT_PTR CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wPara
EditSetSelectionEx(Globals.hwndEdit, s_InitialAnchorPos, s_InitialCaretPos, -1, -1);
}
}
if (Globals.bHideNonMatchedLines) { EditHideNotMarkedLineRange(Globals.hwndEdit, true); }
_OBSERVE_NOTIFY_CHANGE_;
if (Globals.bHideNonMatchedLines) { EditHideNotMarkedLineRange(Globals.hwndEdit, 0, -1, true); }
}
}
else {
@ -6488,7 +6488,6 @@ void EditToggleView(HWND hwnd)
bool const bWaitCursor = ((Globals.iMarkOccurrencesCount > 1000) || (SciCall_GetLineCount() > 2000)) ? true : false;
if (bWaitCursor) { BeginWaitCursor(NULL); }
_IGNORE_NOTIFY_CHANGE_;
if (!Globals.bHideNonMatchedLines) {
bSaveFoldingAvailable = Globals.bCodeFoldingAvailable;
@ -6501,7 +6500,7 @@ void EditToggleView(HWND hwnd)
Globals.bHideNonMatchedLines = !Globals.bHideNonMatchedLines; // toggle
EditHideNotMarkedLineRange(hwnd, 0, -1, Globals.bHideNonMatchedLines);
EditHideNotMarkedLineRange(hwnd, Globals.bHideNonMatchedLines);
if (Globals.bHideNonMatchedLines) {
EditScrollTo(hwnd, 0, false);
@ -6512,7 +6511,6 @@ void EditToggleView(HWND hwnd)
SciCall_SetReadOnly(false);
}
_OBSERVE_NOTIFY_CHANGE_;
if (bWaitCursor) { EndWaitCursor(); }
}
@ -6921,39 +6919,22 @@ void EditUpdateUrlHotspots(HWND hwnd, DocPos startPos, DocPos endPos, bool bActi
//
// EditHideNotMarkedLineRange()
//
void EditHideNotMarkedLineRange(HWND hwnd, DocPos iStartPos, DocPos iEndPos, bool bHideLines)
void EditHideNotMarkedLineRange(HWND hwnd, bool bHideLines)
{
UNUSED(hwnd);
if (iEndPos < iStartPos) {
swapos(&iStartPos, &iEndPos);
}
if (iStartPos < 0 || iEndPos < 0) {
iStartPos = 0;
iEndPos = Sci_GetDocEndPosition();
}
_IGNORE_NOTIFY_CHANGE_;
DocPos const iStartPos = 0;
DocPos const iEndPos = Sci_GetDocEndPosition();
if (!bHideLines) {
_DeleteLineStateAll(LINESTATE_OCCURRENCE_MARK);
if (!Globals.bCodeFoldingAvailable) { SciCall_SetProperty("fold", "0"); }
DocLn const iLnCount = SciCall_GetLineCount();
for (DocLn iLine = 0; iLine < iLnCount; ++iLine) { SciCall_SetFoldLevel(iLine, SC_FOLDLEVELBASE); }
SciCall_SetFoldFlags(0);
Style_SetFolding(hwnd, Globals.bCodeFoldingAvailable && Settings.ShowCodeFolding);
SciCall_FoldAll(EXPAND);
Sci_ApplyLexerStyle(0, -1);
EditUpdateUrlHotspots(hwnd, 0, -1, Settings.HyperlinkHotspot);
EditFinalizeStyling(-1);
}
else // ===== hide lines without marker =====
{
// !!! do not apply LexerStyles here,
// cause some Lexers destroy/reset LineState of Occurrences marker
//~Sci_ApplyStyle(0, -1); // reset
// prepare hidden (folding) settings
Globals.bCodeFoldingAvailable = true; // saved before
Settings.ShowCodeFolding = true; // saved before
@ -6966,12 +6947,14 @@ void EditHideNotMarkedLineRange(HWND hwnd, DocPos iStartPos, DocPos iEndPos, boo
SciCall_SetFoldFlags(0);
//SciCall_SetFoldFlags(SC_FOLDFLAG_LEVELNUMBERS | SC_FOLDFLAG_LINESTATE); // Debug
// --- hide lines without indicator ---
Sci_ApplyLexerStyle(0, -1);
EditMarkAllOccurrences(hwnd, false); // restore - Lexers destroy the LineState bitset
EditUpdateUrlHotspots(hwnd, 0, -1, Settings.HyperlinkHotspot);
DocLn const iStartLine = SciCall_LineFromPosition(iStartPos);
DocLn const iEndLine = SciCall_LineFromPosition(iEndPos);
int const baseLevel = SciCall_GetFoldLevel(iStartLine) & SC_FOLDLEVELNUMBERMASK;
int const baseLevel = SC_FOLDLEVELBASE;
// clear levels to avoid multi rearangements on existing lexer provided levels
for (DocLn iLine = iStartLine; iLine <= iEndLine; ++iLine)
@ -6983,12 +6966,8 @@ void EditHideNotMarkedLineRange(HWND hwnd, DocPos iStartPos, DocPos iEndPos, boo
int level = baseLevel;
if ((SciCall_GetLineState(iStartLine) & LINESTATE_OCCURRENCE_MARK) != 0)
{ // hide
DocPos const begPos = SciCall_PositionFromLine(iStartLine);
DocPos const lnLen = SciCall_LineLength(iStartLine);
SciCall_StartStyling(begPos);
SciCall_SetStyling((DocPosCR)lnLen, Style_GetInvisibleStyleID());
SciCall_SetFoldLevel(iStartLine, SC_FOLDLEVELWHITEFLAG | level);
{
SciCall_SetFoldLevel(iStartLine, SC_FOLDLEVELWHITEFLAG | level); // hide
}
for (DocLn iLine = iStartLine + 1; iLine <= iEndLine; ++iLine)
@ -7000,30 +6979,14 @@ void EditHideNotMarkedLineRange(HWND hwnd, DocPos iStartPos, DocPos iEndPos, boo
}
else // hide line
{
DocPos const begPos = SciCall_PositionFromLine(iLine);
DocPos const lnLen = SciCall_LineLength(iLine);
SciCall_StartStyling(begPos);
SciCall_SetStyling((DocPosCR)lnLen, Style_GetInvisibleStyleID());
if (level == baseLevel) {
SciCall_SetFoldLevel(iLine - 1, SC_FOLDLEVELHEADERFLAG | level++);
}
SciCall_SetFoldLevel(iLine, SC_FOLDLEVELWHITEFLAG | level);
}
}
DocPos const iTextLength = SciCall_GetTextLength();
if (iEndPos < iTextLength) {
DocPos const iStartStyling = SciCall_PositionFromLine(iEndLine + 1);
if ((iStartStyling >= 0) && (iStartStyling < iTextLength)) {
SciCall_StartStyling(iStartStyling);
EditFinalizeStyling(-1);
}
}
SciCall_FoldAll(FOLD);
}
_OBSERVE_NOTIFY_CHANGE_;
}

2
src/Edit.h
View File

@ -110,7 +110,7 @@ void EditSetBookmarkList(HWND hwnd,LPCWSTR pszBookMarks);
void EditFinalizeStyling(DocPos iEndPos);
void EditMarkAllOccurrences(HWND hwnd, bool bForceClear);
void EditApplyVisibleStyle(HWND hwnd);
void EditHideNotMarkedLineRange(HWND hwnd, DocPos iStartPos, DocPos iEndPos, bool);
void EditHideNotMarkedLineRange(HWND hwnd, bool bHideLines);
#define FV_TABWIDTH 1

5
src/Notepad3.c
View File

@ -261,7 +261,6 @@ void ObserveNotifyChangeEvent()
}
if (CheckNotifyChangeEvent()) {
EditUpdateUrlHotspots(Globals.hwndEdit, 0, -1, Settings.HyperlinkHotspot);
EditFinalizeStyling(-1);
UpdateAllBars(false);
}
}
@ -1331,7 +1330,6 @@ LRESULT CALLBACK MainWndProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
case WM_SYSCOLORCHANGE:
MarkAllOccurrences(0, true);
EditUpdateUrlHotspots(Globals.hwndEdit, 0, -1, Settings.HyperlinkHotspot);
EditFinalizeStyling(-1);
UpdateAllBars(false);
return DefWindowProc(hwnd,umsg,wParam,lParam);
@ -2285,7 +2283,6 @@ LRESULT MsgDPIChanged(HWND hwnd, WPARAM wParam, LPARAM lParam)
UpdateUI();
EditUpdateUrlHotspots(Globals.hwndEdit, 0, -1, Settings.HyperlinkHotspot);
EditFinalizeStyling(-1);
UpdateAllBars(false);
return 0;
@ -2349,7 +2346,6 @@ LRESULT MsgThemeChanged(HWND hwnd, WPARAM wParam ,LPARAM lParam)
if (Globals.bHideNonMatchedLines) { EditToggleView(Globals.hwndEdit); }
MarkAllOccurrences(0, true);
EditUpdateUrlHotspots(Globals.hwndEdit, 0, -1, Settings.HyperlinkHotspot);
EditFinalizeStyling(-1);
UpdateUI();
UpdateAllBars(false);
@ -3546,7 +3542,6 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
EndWaitCursor();
Sci_ApplyLexerStyle(0, -1);
EditUpdateUrlHotspots(Globals.hwndEdit, 0, -1, Settings.HyperlinkHotspot);
EditFinalizeStyling(-1);
UpdateStatusbar(false);
}
break;

1
src/Styles.c
View File

@ -1313,7 +1313,6 @@ void Style_SetLexer(HWND hwnd, PEDITLEXER pLexNew)
// apply lexer styles
Sci_ApplyLexerStyle(0, -1);
EditUpdateUrlHotspots(hwnd, 0, -1, Settings.HyperlinkHotspot);
EditFinalizeStyling(-1);
UpdateAllBars(false);
}

2
src/VersionEx.h
View File

@ -8,7 +8,7 @@
#define VERSION_MAJOR 5
#define VERSION_MINOR 19
#define VERSION_REV 502
#define VERSION_BUILD 1686
#define VERSION_BUILD 1687
#define SCINTILLA_VER 415
#define ONIGMO_REGEX_VER 6.2.0
#define VERSION_PATCH RC