From becf3b56584e4e80616e997e1f5cc77536a05aa2 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Mon, 14 Nov 2022 17:29:45 +0100 Subject: [PATCH 1/3] + Upd: Version files and Changes.txt --- Build/Changes.txt | 12 +++++++++++- Versions/day.txt | 2 +- res/Notepad3.exe.conf.manifest | 2 +- src/VersionEx.h | 2 +- .../{ => StyleLexers/styleLexCPP}/Empty.cpp | 0 5 files changed, 14 insertions(+), 4 deletions(-) rename test/test_files/{ => StyleLexers/styleLexCPP}/Empty.cpp (100%) diff --git a/Build/Changes.txt b/Build/Changes.txt index abcf1b28a..cd440bb5f 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -34,7 +34,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library ======================================================== -Current BETA/RC Version 5.22.1104.(build_#) (2022-11-04) +Current BETA/RC Version 5.22.1114.(build_#) (2022-11-14) ======================================================== -------------------------------------------------------- @@ -63,6 +63,10 @@ NEW: CHANGES: -------------------------------------------------------- [.###.#]- . +[1114.1]- Minor corrections to project properties. +[1114.1]- VS2022-vc143 build (WM_DPICHANGED not send). +[1114.1]- Revert all NP3 project files to vc142 toolset. +[1114.1]- Workaround to fix DPI scaling issues related to VS2022 compiler toolset. [1104.1]- Full font description in resource files. [1029.1]- Refactoring of undo/redo and document modify handler. [1020.1]- Standard DarkMode Theme. @@ -118,6 +122,12 @@ CHANGES Versions in Tools or Libraries: FIXES: -------------------------------------------------------- [.###.#]- . +[1114.1]- Set correct _WIN32_WINNT version (0x0601 /*_WIN32_WINNT_WIN7*/). +[1114.1]- Common Base Whitespace style not cleared if default. +[1114.1]- Linker must generate Manifest (???). +[1114.1]- All static link libs should be toolset vc142 compiled. +[1114.1]- Adapt AppVeyor AHK Tests to vc142. +[1114.1]- Don't store contrast adapted dark mode foreground color themes. [1104.1]- Common base font size scheme handling. [1104.1]- Context menu: web action handler. [1104.1]- Modification marker based on selection history. diff --git a/Versions/day.txt b/Versions/day.txt index 0141c45d7..2b4ff5662 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -1104 +1114 diff --git a/res/Notepad3.exe.conf.manifest b/res/Notepad3.exe.conf.manifest index f0e40cb42..f6cc0a4bc 100644 --- a/res/Notepad3.exe.conf.manifest +++ b/res/Notepad3.exe.conf.manifest @@ -3,7 +3,7 @@ diff --git a/src/VersionEx.h b/src/VersionEx.h index 48d76e960..32408dad0 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -8,7 +8,7 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 22 -#define VERSION_REV 1104 +#define VERSION_REV 1114 #define VERSION_BUILD 1 #define SCINTILLA_VER 531 #define LEXILLA_VER 520 diff --git a/test/test_files/Empty.cpp b/test/test_files/StyleLexers/styleLexCPP/Empty.cpp similarity index 100% rename from test/test_files/Empty.cpp rename to test/test_files/StyleLexers/styleLexCPP/Empty.cpp From 680dadcacfb180de68091de6483a207349f9c285 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Mon, 14 Nov 2022 19:54:42 +0100 Subject: [PATCH 2/3] MUI - Minor correction to displaying relative size --- src/StyleLexers/styleLexStandard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/StyleLexers/styleLexStandard.c b/src/StyleLexers/styleLexStandard.c index 52db51d56..b3f1840a2 100644 --- a/src/StyleLexers/styleLexStandard.c +++ b/src/StyleLexers/styleLexStandard.c @@ -82,7 +82,7 @@ EDITLEXER lexANSI = { SCLEX_NULL, "null", IDS_LEX_ANSI_ART, L"ANSI Art", L"nfo; diz; \\^Readme$", L"", &KeyWords_NULL,{ - { {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"font:Lucida Console; thin; size:11; smoothing:aliased", L"" }, + { {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"font:Lucida Console; thin; size:+11; smoothing:aliased", L"" }, { {STYLE_LINENUMBER}, IDS_LEX_STD_MARGIN, L"Margins and Line Numbers", L"font:Lucida Console; size:-2", L"" }, { {STYLE_BRACELIGHT}, IDS_LEX_STD_BRACE, L"Matching Braces", L"", L"" }, { {STYLE_BRACEBAD}, IDS_LEX_STD_BRACE_FAIL, L"Matching Braces Error", L"", L"" }, From 69492c739b1a1ae5bd6b7237faad3c4bb266654c Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Mon, 14 Nov 2022 19:55:07 +0100 Subject: [PATCH 3/3] + Upd: Version files and Changes.txt --- Build/Changes.txt | 1 + Versions/build.txt | 2 +- res/Notepad3.exe.conf.manifest | 2 +- src/VersionEx.h | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Build/Changes.txt b/Build/Changes.txt index cd440bb5f..7b99fa1f3 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -122,6 +122,7 @@ CHANGES Versions in Tools or Libraries: FIXES: -------------------------------------------------------- [.###.#]- . +[1114.1]- Reset change history except in case of "revert from file". [1114.1]- Set correct _WIN32_WINNT version (0x0601 /*_WIN32_WINNT_WIN7*/). [1114.1]- Common Base Whitespace style not cleared if default. [1114.1]- Linker must generate Manifest (???). diff --git a/Versions/build.txt b/Versions/build.txt index d00491fd7..0cfbf0888 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -1 +2 diff --git a/res/Notepad3.exe.conf.manifest b/res/Notepad3.exe.conf.manifest index f6cc0a4bc..851fb163d 100644 --- a/res/Notepad3.exe.conf.manifest +++ b/res/Notepad3.exe.conf.manifest @@ -3,7 +3,7 @@ diff --git a/src/VersionEx.h b/src/VersionEx.h index 32408dad0..e3fda68a6 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -9,7 +9,7 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 22 #define VERSION_REV 1114 -#define VERSION_BUILD 1 +#define VERSION_BUILD 2 #define SCINTILLA_VER 531 #define LEXILLA_VER 520 #define ONIGURUMA_REGEX_VER 6.9.8