From 96df891e62e30f0308feb972b398a673594a96e8 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Mon, 17 Aug 2020 18:24:56 +0200 Subject: [PATCH 1/2] + upd: Version files and Changes.txt --- Build/Changes.txt | 5 +++-- Versions/build.txt | 2 +- res/Notepad3.exe.manifest.conf | 2 +- src/VersionEx.h | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Build/Changes.txt b/Build/Changes.txt index 005ba29b8..8e330b842 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -57,9 +57,10 @@ NEW: CHANGES: ----------------------------------------------------- [.###.#]- +[.817.2]- grepWinNP3 and minipath: special dialog box UI fonts for Asian languages. [.816.1]- Use optimized Asian UI fonts for Notepad3 dialog boxes. [.815.1]- Focused View: scroll to current position on each toggle. -[.805.1]- "grepWinNP3": add OS architecture (x64) - AboutBox (GRE). +[.805.1]- grepWinNP3: add OS architecture (x64) - AboutBox (GRE). [.805.1]- Replace "64-bit"/"BETA" by "x64"/"beta" to shorter the version name. [.803.1]- Title font change DPI-Awareness for About and Customize Schemes dialog. [.802.1]- Resample scaling of info-box icons on DPI change. @@ -68,7 +69,7 @@ CHANGES: [.729.1]- DPI-Aware About & Custom.Scheme dialog. [.729.1]- Swap Shortcuts: "Search in Files" -> "Ctrl+Shift+F" and Toggle Folds -> "Ctrl+Alt+F". [.723.1]- Review document modified handler (dirty-flag). -[.816.1]- Update grepWinNP3 (GRE) version 2.1.3.24 (2020-08-16). +[.817.2]- Update grepWinNP3 (GRE) version 2.1.3.26 (2020-08-17). [.813.1]- Update Oniguruma Regex (ONI) engine version 6.9.6 (2020-07-31). [.724.1]- Update Scintilla Library (SCI) version 4.4.4 (2020-07-21). 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.manifest.conf b/res/Notepad3.exe.manifest.conf index 668e2c3e2..809cbb85e 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 beta diff --git a/src/VersionEx.h b/src/VersionEx.h index 07f303c83..c8d0ac163 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -9,7 +9,7 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 20 #define VERSION_REV 817 -#define VERSION_BUILD 1 +#define VERSION_BUILD 2 #define SCINTILLA_VER 444 #define ONIGURUMA_REGEX_VER 6.9.5 #define UCHARDET_VER 2018.09.27 From a91c6042f14a05e02f45c05952edfcf51eac19b1 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Mon, 17 Aug 2020 20:44:17 +0200 Subject: [PATCH 2/2] + chg: Adjust the position of "grepWinNP3" icon. --- grepWinNP3/src/AboutDlg.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grepWinNP3/src/AboutDlg.cpp b/grepWinNP3/src/AboutDlg.cpp index 62390f23a..27a3029e9 100644 --- a/grepWinNP3/src/AboutDlg.cpp +++ b/grepWinNP3/src/AboutDlg.cpp @@ -47,8 +47,8 @@ static LRESULT DrawGrepWinIcon(HWND hWnd) { BeginPaint(hWnd, &ps); int const dpiSized = CDPIAware::Instance().Scale(hWnd, 64); - int const dpiLeft = CDPIAware::Instance().Scale(hWnd, 22); - int const dpiTop = CDPIAware::Instance().Scale(hWnd, 44); + int const dpiLeft = CDPIAware::Instance().Scale(hWnd, 12); + int const dpiTop = CDPIAware::Instance().Scale(hWnd, 12); HBRUSH const hBrush = (HBRUSH)GetSysColorBrush(COLOR_3DFACE); DrawIconEx(hDC, dpiLeft, dpiTop, g_hDlgIcon128, dpiSized, dpiSized, 0, hBrush, DI_NORMAL); ReleaseDC(hWnd, hDC);