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

+ fix: repair Hyperlink styling, broken by last commit

Browse Source
This commit is contained in:
Rainer Kottenhoff 2019-04-27 15:55:10 +02:00
parent 100d0d5ae0
commit 9f41b18165
6 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Versions/build.txt
View File

@ -1 +1 @@
1676
1677

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

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.19.427.1676"
version="5.19.427.1677"
type="win32"
/>
<description>Notepad3 develop</description>

10
src/Notepad3.c
View File

@ -260,6 +260,8 @@ void ObserveNotifyChangeEvent()
InterlockedDecrement(&iNotifyChangeStackCounter);
}
if (CheckNotifyChangeEvent()) {
EditApplyVisibleStyle();
//~!recursion!~EditUpdateVisibleUrlHotspot(Settings.HyperlinkHotspot);
UpdateAllBars(false);
}
}
@ -1322,6 +1324,7 @@ LRESULT CALLBACK MainWndProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
// update Scintilla colors
case WM_SYSCOLORCHANGE:
Sci_ApplyStyle(0, -1);
MarkAllOccurrences(0, true);
UpdateVisibleUrlHotspot(0);
UpdateAllBars(false);
@ -2276,6 +2279,7 @@ LRESULT MsgDPIChanged(HWND hwnd, WPARAM wParam, LPARAM lParam)
SendWMSize(hwnd, rc);
UpdateUI();
Sci_ApplyStyle(0, -1);
UpdateAllBars(false);
return 0;
@ -2343,6 +2347,7 @@ LRESULT MsgThemeChanged(HWND hwnd, WPARAM wParam ,LPARAM lParam)
EditUpdateUrlHotspots(Globals.hwndEdit, 0, -1, Settings.HyperlinkHotspot);
UpdateUI();
Sci_ApplyStyle(0, -1);
UpdateAllBars(false);
return 0;
@ -9197,7 +9202,7 @@ void UpdateUI()
scn.nmhdr.hwndFrom = Globals.hwndEdit;
scn.nmhdr.idFrom = IDC_EDIT;
scn.nmhdr.code = SCN_UPDATEUI;
scn.updated = (SC_UPDATE_CONTENT | SC_UPDATE_NP3_INTERNAL_NOTIFY);
scn.updated = (SC_UPDATE_CONTENT/* | SC_UPDATE_NP3_INTERNAL_NOTIFY */);
SendMessage(Globals.hwndMain, WM_NOTIFY, IDC_EDIT, (LPARAM)&scn);
//PostMessage(Globals.hwndMain, WM_NOTIFY, IDC_EDIT, (LPARAM)&scn);
Sci_ApplyStyle(0, -1);
@ -9759,8 +9764,9 @@ bool FileLoad(bool bDontSave, bool bNew, bool bReload,
//bReadOnly = false;
_SetSaveNeededFlag(false);
Sci_ApplyStyle(0, -1);
UpdateVisibleUrlHotspot(0);
UpdateAllBars(false);
UpdateAllBars(true);
// consistent settings file handling (if loaded in editor)
s_bEnableSaveSettings = (StringCchCompareNIW(Globals.CurrentFile, COUNTOF(Globals.CurrentFile), Globals.IniFile, COUNTOF(Globals.IniFile)) == 0) ? false : true;

2
src/Notepad3.h
View File

@ -144,7 +144,7 @@ void UpdateStatusbar(bool);
void UpdateMarginWidth();
void UpdateSettingsCmds();
void UpdateVisibleUrlHotspot(int delay);
inline void UpdateAllBars(bool force) { UpdateToolbar(); UpdateStatusbar(force); UpdateMarginWidth(); Sci_ApplyStyle(0,-1); }
inline void UpdateAllBars(bool force) { UpdateToolbar(); UpdateStatusbar(force); UpdateMarginWidth(); }
void UndoRedoRecordingStart();
void UndoRedoRecordingStop();

1
src/Styles.c
View File

@ -1310,6 +1310,7 @@ void Style_SetLexer(HWND hwnd, PEDITLEXER pLexNew)
Style_SetInvisible(hwnd, false); // set fixed invisible style
// apply lexer styles
Sci_ApplyStyle(0, -1);
Style_SetUrlHotSpot(hwnd, Settings.HyperlinkHotspot);
EditUpdateUrlHotspots(hwnd, 0, -1, Settings.HyperlinkHotspot);

2
src/VersionEx.h
View File

@ -8,7 +8,7 @@
#define VERSION_MAJOR 5
#define VERSION_MINOR 19
#define VERSION_REV 427
#define VERSION_BUILD 1676
#define VERSION_BUILD 1677
#define SCINTILLA_VER 415
#define ONIGMO_REGEX_VER 6.2.0
#define VERSION_PATCH develop