Merge remote-tracking branch 'upstream/master' into Dev_NewFeatures

This commit is contained in:
RaiKoHoff 2020-08-18 07:34:58 +02:00
commit 71dc4a7ce1
5 changed files with 8 additions and 7 deletions

View File

@ -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).

View File

@ -1 +1 @@
1
2

View File

@ -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);

View File

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.20.817.1"
version="5.20.817.2"
type="win32"
/>
<description>Notepad3 beta</description>

View File

@ -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