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

Merge remote-tracking branch 'notepad3_orig_rizone/master' into Future_Dev_Master

Browse Source
This commit is contained in:
METANEOCORTEX\Kotti 2023-01-15 16:03:07 +01:00
commit d078618d7d
13 changed files with 103 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Build/Changes.txt
View File

@ -34,13 +34,14 @@ UCD - (UCD)ARDET is an Encoding Detector Library
========================================================
Current BETA/RC Version 5.23.106.(build_#) (2023-01-06)
Current BETA/RC Version 5.23.109.(build_#) (2023-01-09)
========================================================
--------------------------------------------------------
NEW:
--------------------------------------------------------
[.###.#]- .
[.109.1]- Allow "dotbox" instead of "horiz. line" for folded text.
[.102.1]- Allow Line Number color to be alpha blended (e.g. DarkMode).
[1223.1]- Allow "Notepad3 x64 Setup" to install on Win11 Arm (64-bit emulation).
[1212.1]- Implementation of automatic parenthesis closure.
@ -64,9 +65,7 @@ NEW:
CHANGES:
--------------------------------------------------------
[.###.#]- .
[.104.1]- Minor refactoring on UpdateUI.
[.104.1]- Move DefaultWindowPosition to Window section (deprecated: Settings2 section).
[.101.1]- Refactoring and fix window positioning respecting monitor DPI.
[1230.1]- Revert to Lexilla's standard Markdown lexer (LEX).
[1230.1]- Change background color for Heading 1 to enhance contrast to std Hyperlink (LEX).
[1230.1]- Visible representation of EOL characters.
@ -121,13 +120,12 @@ CHANGES Versions in Tools or Libraries:
FIXES:
--------------------------------------------------------
[.###.#]- .
[.106.1]- Not intended replacement of "~" used in short windows path names.
[.109.1]- Trigger mark-all-occ after transform backslash (EscCtrlChr) in F/R-Box is used.
[.105.1]- Some WSL2 (Linux) path issues.
[.104.1]- Handling of editing own settings (in this case: disable file watching).
[.104.1]- Path to module relative representation.
[.103.1]- Load Toolbar-Bitmap handling.
[.102.1]- Minor design change and some fixes for Margin and Bookmark handling.
[1230.1]- Minor bugs related to new feature Change-History.
[1230.1]- (re)setting default window position in case of non std DPI resolution.
[1228.1]- Speedup search&replace in large text files.
[1227.1]- Use alternate path, if Path_GetKnownFolder() failed.
@ -236,7 +234,6 @@ to resume "(incomplete...)" translation projects:
- Greek (el-GR) (incomplete...)
- Hindi (hi-IN) (incomplete...)
- Indonesian (id-ID) (incomplete...)
- Polish (pl-PL) (incomplete...)
- Portuguese (pt-PT) (incomplete...)
- Spanish Mexican (es-MX) (incomplete...)
- Vietnamese (vi-VN) (incomplete...)

2
Versions/day.txt
View File

@ -1 +1 @@
106
109

14
language/np3_el_gr/dialogs_el_gr.rc
View File

@ -254,20 +254,20 @@ BEGIN
PUSHBUTTON "Ά&κυρο",IDCANCEL,7,74,50,14
END
IDD_MUI_FILEMRU DIALOGEX 0, 0, 275, 180
IDD_MUI_FILEMRU DIALOGEX 0, 0, 269, 180
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Άνοιγμα πρόσφατου αρχείου"
FONT 9, "Segoe UI", 400, 0, 0x1
BEGIN
CONTROL "",IDC_FILEMRU,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,261,97
CONTROL "&Αποθήκευση λίστας πρόσφατων αρχείων κατά την έξοδο.",IDC_SAVEMRU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,107,207,10
CONTROL "",IDC_FILEMRU,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,255,97
CONTROL "&Αποθήκευση λίστας πρόσφατων αρχείων κατά τη έξοδο.",IDC_SAVEMRU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,107,205,10
CONTROL "Απομνημόνευση &θέσης δρομέα.",IDC_PRESERVECARET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,119,120,10
CONTROL "Απομνημόνευση &μοτίβου αναζήτησης.",IDC_REMEMBERSEARCHPATTERN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,131,140,10
CONTROL "&Autoload most recent file on startup.",IDC_AUTOLOAD_MRU_FILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,143,180,10
CONTROL "Από&ρριψη", IDC_REMOVE, "Button", BS_DEFSPLITBUTTON | WS_TABSTOP | WS_DISABLED, 218 107, 50, 14
DEFPUSHBUTTON "&Εντάξει",IDOK,160,158,50,14,WS_DISABLED
PUSHBUTTON "&Κλείσιμο",IDCANCEL,218,158,50,14
SCROLLBAR IDC_RESIZEGRIP,7,149,10,10
CONTROL "Από&ρριψη", IDC_REMOVE, "Button", BS_DEFSPLITBUTTON | WS_TABSTOP | WS_DISABLED, 212 107, 50, 14
DEFPUSHBUTTON "&Εντάξει",IDOK,154,158,50,14,WS_DISABLED
PUSHBUTTON "&Κλείσιμο",IDCANCEL,212,158,50,14
SCROLLBAR IDC_RESIZEGRIP,7,143,10,10
END
IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 103

2
language/np3_pl_pl/dialogs_pl_pl.rc
View File

@ -263,7 +263,7 @@ BEGIN
CONTROL "&Zapisz ostatnią listę pliku przy wyjściu.",IDC_SAVEMRU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,107,140,10
CONTROL "&Zachowaj znak wstawienia.",IDC_PRESERVECARET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,119,120,10
CONTROL "&Zapamiętaj wzór wyszukiwania.",IDC_REMEMBERSEARCHPATTERN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,131,120,10
CONTROL "&Automatyczne ładowanie ostatniego pliku przy starcie systemu.",IDC_AUTOLOAD_MRU_FILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,143,160,10
CONTROL "&Automatyczne ładowanie ostatniego pliku przy starcie systemu.",IDC_AUTOLOAD_MRU_FILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,143,220,10
CONTROL "Odrzuć", IDC_REMOVE, "Button", BS_DEFSPLITBUTTON | WS_TABSTOP | WS_DISABLED, 212, 107, 50, 14
DEFPUSHBUTTON "OK",IDOK,154,158,50,14,WS_DISABLED
PUSHBUTTON "Zamknij",IDCANCEL,212,158,50,14

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

@ -3,7 +3,7 @@
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
<assemblyIdentity
name="Rizonesoft.Notepad3"
version="5.23.106.1"
version="5.23.109.1"
processorArchitecture="*"
type="win32"
/>

2
src/Config/Config.cpp
View File

@ -1652,7 +1652,7 @@ void LoadSettings()
GET_INT_VALUE_FROM_INISECTION(RecodeDlgSizeX, 340, INT_MIN, INT_MAX);
GET_INT_VALUE_FROM_INISECTION(RecodeDlgSizeY, 292, INT_MIN, INT_MAX);
GET_INT_VALUE_FROM_INISECTION(FileMRUDlgSizeX, 487, INT_MIN, INT_MAX);
GET_INT_VALUE_FROM_INISECTION(FileMRUDlgSizeY, 339, INT_MIN, INT_MAX);
GET_INT_VALUE_FROM_INISECTION(FileMRUDlgSizeY, 377, INT_MIN, INT_MAX);
GET_INT_VALUE_FROM_INISECTION(OpenWithDlgSizeX, 305, INT_MIN, INT_MAX);
GET_INT_VALUE_FROM_INISECTION(OpenWithDlgSizeY, 281, INT_MIN, INT_MAX);
GET_INT_VALUE_FROM_INISECTION(FavoritesDlgSizeX, 305, INT_MIN, INT_MAX);

19
src/Dialogs.c
View File

@ -665,7 +665,10 @@ static bool GetTrayWndRect(LPRECT lpTrayRect) {
}
void MinimizeWndToTray(HWND hWnd) {
if (GetDoAnimateMinimize()) {
bool const bAnimate = GetDoAnimateMinimize();
if (bAnimate) {
// Get the rect of the window. It is safe to use the rect of the whole
// window - DrawAnimatedRects will only draw the caption
@ -683,11 +686,14 @@ void MinimizeWndToTray(HWND hWnd) {
// This looks untidy, so call the functions in this order
// Hide the window
ShowWindow(hWnd, SW_MINIMIZE);
if (bAnimate) { Sleep(500); }
ShowWindow(hWnd, SW_HIDE);
Globals.bMinimizedToTray = true;
}
void RestoreWndFromTray(HWND hWnd) {
if (GetDoAnimateMinimize()) {
// Get the rect of the tray and the window. Note that the window rect
@ -703,6 +709,7 @@ void RestoreWndFromTray(HWND hWnd) {
// Show the window, and make sure we're the foreground window
ShowWindow(hWnd, SW_SHOW);
ShowWindow(hWnd, SW_RESTORE);
SetActiveWindow(hWnd);
SetForegroundWindow(hWnd);
Globals.bMinimizedToTray = false;
@ -6393,6 +6400,16 @@ LRESULT SendWMSize(HWND hwnd, RECT* rc)
return SendMessage(hwnd, WM_SIZE, SIZE_RESTORED, MAKELPARAM(wndrc.right, wndrc.bottom));
}
//=============================================================================
//
// UpdateUI()
//
void UpdateUI(HWND hwnd)
{
SendWMSize(hwnd, NULL);
PostMessage(hwnd, WM_NCACTIVATE, FALSE, -1); // (!)
PostMessage(hwnd, WM_NCACTIVATE, TRUE, 0);
}
//=============================================================================

3
src/Dialogs.h
View File

@ -236,7 +236,8 @@ void UpdateWindowLayoutForDPI(HWND hwnd, const RECT *pRC, const UINT dpi);
//#define BMP_RESAMPLE_FILTER STOCK_FILTER_QUADRATICBSPLINE
HBITMAP ResampleImageBitmap(HWND hwnd, HBITMAP hbmp, int width, int height);
LRESULT SendWMSize(HWND hwnd, RECT* rc);
//HFONT CreateAndSetFontDlgItemDPI(HWND hdlg, const int idDlgItem, int fontSize, bool bold);
void UpdateUI(HWND hwnd);
// HFONT CreateAndSetFontDlgItemDPI(HWND hdlg, const int idDlgItem, int fontSize, bool bold);
// ----------------------------------------------------------------------------

20
src/Edit.c
View File

@ -171,9 +171,11 @@ static int sortcmp(void *mqc1, void *mqc2) {
// ----------------------------------------------------------------------------
#define _MQ_TIMER_CYCLE (USER_TIMER_MINIMUM << 1)
#define _MQ_STD (_MQ_TIMER_CYCLE << 2)
#define _MQ_ms2cycl(T) (((T) + USER_TIMER_MINIMUM) / _MQ_TIMER_CYCLE)
#define _MQ_STD (_MQ_TIMER_CYCLE << 2)
#define _MQ_ASAP 0
static void _MQ_AppendCmd(CmdMessageQueue_t* const pMsgQCmd, int cycles)
{
@ -6883,10 +6885,16 @@ static INT_PTR CALLBACK EditFindReplaceDlgProc(HWND hwnd, UINT umsg, WPARAM wPar
case IDC_REPLESCCTRLCHR: {
UINT const ctrl_id = (LOWORD(wParam) == IDC_FINDESCCTRLCHR) ? IDC_FINDTEXT : IDC_REPLACETEXT;
GetDlgItemTextW(hwnd, ctrl_id, s_wchBufIn, COUNTOF(s_wchBufIn));
if (SlashCtrlW(s_wchBufOut, COUNTOF(s_wchBufOut), s_wchBufIn) == StringCchLen(s_wchBufIn, 0)) {
size_t const inLen = StringCchLen(s_wchBufIn, 0);
if (SlashCtrlW(s_wchBufOut, COUNTOF(s_wchBufOut), s_wchBufIn) == inLen) {
UnSlashCtrlW(s_wchBufOut);
}
SetDlgItemTextW(hwnd, ctrl_id, s_wchBufOut);
if ((ctrl_id == IDC_FINDTEXT) && (inLen != StringCchLen(s_wchBufOut, 0))) {
Globals.FindReplaceMatchFoundState = FND_NOP;
_SetSearchFlags(hwnd, s_pEfrData);
_DelayMarkAll(_MQ_ASAP);
}
}
break;
@ -6895,9 +6903,11 @@ static INT_PTR CALLBACK EditFindReplaceDlgProc(HWND hwnd, UINT umsg, WPARAM wPar
GetDlgItemTextW(hwnd, IDC_REPLACETEXT, s_wchBufIn, COUNTOF(s_wchBufIn));
SetDlgItemTextW(hwnd, IDC_FINDTEXT, s_wchBufIn);
SetDlgItemTextW(hwnd, IDC_REPLACETEXT, s_wchBufOut);
Globals.FindReplaceMatchFoundState = FND_NOP;
_SetSearchFlags(hwnd, s_pEfrData);
_DelayMarkAll(_MQ_STD);
if (StringCchCompareX(s_wchBufIn, s_wchBufOut) != 0) {
Globals.FindReplaceMatchFoundState = FND_NOP;
_SetSearchFlags(hwnd, s_pEfrData);
_DelayMarkAll(_MQ_ASAP);
}
}
break;

96
src/Notepad3.c
View File

@ -1034,6 +1034,8 @@ void InvalidParameterHandler(const wchar_t* expression,
//
int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPWSTR lpCmdLine, _In_ int nShowCmd)
{
UNREFERENCED_PARAMETER(lpCmdLine);
_invalid_parameter_handler const hNewInvalidParamHandler = InvalidParameterHandler;
_hOldInvalidParamHandler= _set_invalid_parameter_handler(hNewInvalidParamHandler);
@ -1259,7 +1261,7 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
return 1;
}
HWND const hwnd = InitInstance(Globals.hInstance, lpCmdLine, nShowCmd);
HWND const hwnd = InitInstance(Globals.hInstance, nShowCmd);
if (!hwnd) {
_CleanUpResources(hwnd, true);
return 1;
@ -1755,10 +1757,8 @@ bool InitWndClass(const HINSTANCE hInstance, LPCWSTR lpszWndClassName, LPCWSTR l
//
// InitInstance() - DarkMode already initialized !
//
HWND InitInstance(const HINSTANCE hInstance, LPCWSTR pszCmdLine, int nCmdShow)
HWND InitInstance(const HINSTANCE hInstance, int nCmdShow)
{
UNREFERENCED_PARAMETER(pszCmdLine);
// init w/o hwnd
g_IniWinInfo = GetWinInfoByFlag(NULL, Globals.CmdLnFlag_WindowPos);
@ -1772,7 +1772,7 @@ HWND InitInstance(const HINSTANCE hInstance, LPCWSTR pszCmdLine, int nCmdShow)
WS_EX_ACCEPTFILES,
s_wchWndClass,
_W(SAPPNAME),
WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN,
(WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN) & ~WS_VISIBLE,
srcninfo.x,
srcninfo.y,
srcninfo.cx,
@ -1782,12 +1782,12 @@ HWND InitInstance(const HINSTANCE hInstance, LPCWSTR pszCmdLine, int nCmdShow)
hInstance,
NULL);
ShowWindow(hwndMain, SW_HIDE); // force to be hidden
// correct infos based on hwnd
g_DefWinInfo = _GetDefaultWinInfoByStrg(hwndMain, Settings2.DefaultWindowPosition);
g_IniWinInfo = GetWinInfoByFlag(hwndMain, Globals.CmdLnFlag_WindowPos);
s_WinCurrentWidth = g_IniWinInfo.cx;
SnapToWinInfoPos(hwndMain, g_IniWinInfo, SCR_NORMAL);
if (g_IniWinInfo.max) {
nCmdShow = SW_SHOWMAXIMIZED;
}
@ -1808,27 +1808,18 @@ HWND InitInstance(const HINSTANCE hInstance, LPCWSTR pszCmdLine, int nCmdShow)
Globals.hwndMain = hwndMain; // make main window globaly available
// Initial FileLoad() moved in front of ShowWindow()
HPATHL hfile_pth = Path_Allocate(L"");
FileLoadFlags fLoadFlags = FLF_DontSave | FLF_New | FLF_SkipUnicodeDetect | FLF_SkipANSICPDetection;
FileLoad(hfile_pth, fLoadFlags); // int editor frame
if (!s_flagStartAsTrayIcon) {
ShowWindow(hwndMain,nCmdShow);
UpdateWindow(hwndMain);
} else {
ShowWindow(hwndMain,SW_HIDE); // trick ShowWindow()
ShowNotifyIcon(hwndMain,true);
}
FileLoadFlags fLoadFlags = FLF_None;
// Source Encoding
Encoding_Forced(s_flagSetEncoding);
// Initial FileLoad() moved in front of ShowWindow()
bool bOpened = false;
// Pathname parameter
if (s_IsThisAnElevatedRelaunch || (Path_IsNotEmpty(s_pthArgFilePath) /*&& !g_flagNewFromClipboard*/)) {
bool bOpened = false;
fLoadFlags = FLF_None;
fLoadFlags |= Settings.SkipUnicodeDetection ? FLF_SkipUnicodeDetect : 0;
fLoadFlags |= Settings.SkipANSICodePageDetection ? FLF_SkipANSICPDetection : 0;
@ -1906,6 +1897,31 @@ HWND InitInstance(const HINSTANCE hInstance, LPCWSTR pszCmdLine, int nCmdShow)
Encoding_Current(forcedEncoding);
}
}
if (!bOpened) {
Path_Reset(hfile_pth, L"");
fLoadFlags = FLF_DontSave | FLF_New | FLF_SkipUnicodeDetect | FLF_SkipANSICPDetection;
FileLoad(hfile_pth, fLoadFlags); // init editor frame
}
// now, after FileLoad() do ShowWindow()
SnapToWinInfoPos(hwndMain, g_IniWinInfo, SCR_NORMAL);
ShowWindowAsync(s_hwndEditFrame, SW_SHOW);
ShowWindowAsync(Globals.hwndEdit, SW_SHOW);
if (!s_flagStartAsTrayIcon) {
UpdateWindow(hwndMain);
ShowWindow(hwndMain, nCmdShow);
}
else {
if (Settings.MinimizeToTray) {
MinimizeWndToTray(hwndMain);
}
else {
ShowWindow(hwndMain, SW_MINIMIZE);
}
ShowNotifyIcon(hwndMain, true);
SetNotifyIconTitle(hwndMain);
}
// reset
Encoding_Forced(CPI_NONE);
@ -2625,7 +2641,7 @@ static void _InitEditWndFrame()
if (!IsWindowsVistaOrGreater()) {
SetWindowPos(s_hwndEditFrame, Globals.hwndEdit, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);
ShowWindow(s_hwndEditFrame, SW_SHOWNORMAL);
ShowWindow(s_hwndEditFrame, SW_HIDE);
RECT rc, rc2;
GetClientRect(s_hwndEditFrame, &rc);
@ -2638,7 +2654,7 @@ static void _InitEditWndFrame()
SetWindowLongPtr(Globals.hwndEdit, GWL_EXSTYLE, WS_EX_CLIENTEDGE | GetWindowLongPtr(Globals.hwndEdit, GWL_EXSTYLE));
SetWindowPos(Globals.hwndEdit, NULL, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);
ShowWindow(Globals.hwndEdit, SW_HIDE);
}
}
@ -2666,7 +2682,7 @@ LRESULT MsgCreate(HWND hwnd, WPARAM wParam,LPARAM lParam)
WS_EX_CLIENTEDGE,
L"Scintilla",
NULL,
WS_CHILD | WS_CLIPSIBLINGS,
(WS_CHILD | WS_CLIPSIBLINGS) & ~WS_VISIBLE,
0, 0, 0, 0,
hwnd,
(HMENU)IDC_EDIT,
@ -2711,7 +2727,7 @@ LRESULT MsgCreate(HWND hwnd, WPARAM wParam,LPARAM lParam)
(void)CreateWindow(
WC_STATIC,
NULL,
WS_CHILD|WS_CLIPSIBLINGS|WS_CLIPCHILDREN,
WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN,
10,10,10,10,
hwnd,
(HMENU)IDC_REUSELOCK,
@ -2732,7 +2748,7 @@ LRESULT MsgCreate(HWND hwnd, WPARAM wParam,LPARAM lParam)
//~ Style_SetDefaultLexer(Globals.hwndEdit); -- done by WM_THEMECHANGED
ShowWindow(Globals.hwndEdit, SW_SHOWNORMAL);
ShowWindow(Globals.hwndEdit, SW_HIDE);
Encoding_Current(Settings.DefaultEncoding);
@ -3166,10 +3182,7 @@ void CreateBars(HWND hwnd, HINSTANCE hInstance)
s_cyReBar = (rc.bottom - rc.top);
s_cyReBarFrame = s_bIsAppThemed ? 0 : 2; // (!) frame color is same as INITIAL title-bar ???
if (Settings.ShowToolbar) {
ShowWindow(Globals.hwndRebar, SW_SHOWNORMAL);
}
ShowWindow(Globals.hwndRebar, Settings.ShowToolbar ? SW_SHOWNORMAL : SW_HIDE);
// -------------------
// Create Statusbar
@ -3209,9 +3222,7 @@ void CreateBars(HWND hwnd, HINSTANCE hInstance)
//~ReleaseDC(Globals.hwndStatus, hdc);
#endif
if (Settings.ShowStatusbar) {
ShowWindow(Globals.hwndStatus, SW_SHOWNORMAL);
}
ShowWindow(Globals.hwndStatus, Settings.ShowStatusbar ? SW_SHOWNORMAL : SW_HIDE);
}
@ -3424,21 +3435,6 @@ void UpdateContentArea()
}
//=============================================================================
//
// UpdateUI()
//
void UpdateUI(HWND hwnd)
{
//if (hwnd == Globals.hwndMain) {
// UpdateContentArea()
//}
SendWMSize(hwnd, NULL);
PostMessage(hwnd, WM_NCACTIVATE, FALSE, -1); // (!)
PostMessage(hwnd, WM_NCACTIVATE, TRUE, 0);
}
//=============================================================================
//
// MsgDrawItem() - Handles WM_DRAWITEM (needs SBT_OWNERDRAW)
@ -6273,7 +6269,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
case IDM_VIEW_TOOLBAR:
Settings.ShowToolbar = !Settings.ShowToolbar;
ShowWindow(Globals.hwndRebar, (Settings.ShowToolbar ? SW_SHOW : SW_HIDE));
ShowWindow(Globals.hwndRebar, (Settings.ShowToolbar ? SW_SHOWNORMAL : SW_HIDE));
UpdateUI(hwnd);
break;
@ -6301,7 +6297,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
case IDM_VIEW_STATUSBAR:
Settings.ShowStatusbar = !Settings.ShowStatusbar;
ShowWindow(Globals.hwndStatus, (Settings.ShowStatusbar ? SW_SHOW : SW_HIDE));
ShowWindow(Globals.hwndStatus, (Settings.ShowStatusbar ? SW_SHOWNORMAL : SW_HIDE));
UpdateUI(hwnd);
break;

3
src/Notepad3.h
View File

@ -107,7 +107,7 @@ typedef enum {
//==== Function Declarations ==================================================
bool InitApplication(const HINSTANCE hInstance);
//~bool InitToolbarWndClass(const HINSTANCE hInstance);
HWND InitInstance(const HINSTANCE hInstance, LPCWSTR pszCmdLine, int nCmdShow);
HWND InitInstance(const HINSTANCE hInstance, int nCmdShow);
void CreateBars(HWND hwnd, HINSTANCE hInstance);
WININFO GetFactoryDefaultWndPos(HWND hwnd, const int flagsPos);
WININFO GetWinInfoByFlag(HWND hwnd, const int flagsPos);
@ -134,7 +134,6 @@ void UpdateMargins(const bool bForce);
void UpdateSaveSettingsCmds();
void UpdateTitlebar(const HWND hwnd);
void UpdateContentArea();
void UpdateUI(HWND hwnd);
void ResetMouseDWellTime();

12
src/Version.h
View File

@ -72,13 +72,13 @@
// ============================================================================
// ----------------------------------------------------------------------------
// https://docs.microsoft.com/en-us/windows/release-health/ (Windows releases health)
// https://docs.microsoft.com/en-us/windows/release-health (Windows releases health)
// https://docs.microsoft.com/en-us/windows/release-health/release-information (Windows 10)
// https://docs.microsoft.com/en-us/windows/release-health/windows11-release-information (Windows 11)
// https://docs.microsoft.com/en-us/windows/release-health/windows-server-release-info (Windows Server)
// https://docs.microsoft.com/en-us/windows-insider/flight-hub/ (Windows Insider Preview Builds)
// https://en.wikipedia.org/wiki/Windows_10/ (Wikipedia: Windows 10)
// https://en.wikipedia.org/wiki/Windows_11/ (Wikipedia: Windows 11)
// https://docs.microsoft.com/en-us/windows-insider/flight-hub (Windows Insider Preview Builds)
// https://en.wikipedia.org/wiki/Windows_10 (Wikipedia: Windows 10)
// https://en.wikipedia.org/wiki/Windows_11 (Wikipedia: Windows 11)
// ----------------------------------------------------------------------------
inline LPCWSTR _Win10BuildToReleaseId(const DWORD build)
@ -151,7 +151,7 @@ inline LPCWSTR _Win10BuildToReleaseId(const DWORD build)
#if defined(_MSC_VER)
#if (_MSC_VER == 1934)
#if (_MSC_FULL_VER >= 193431937)
#define VER_CPL MS Visual C++ 2022 v17.4.3
#define VER_CPL MS Visual C++ 2022 v17.4.(3-4)
#elif (_MSC_FULL_VER >= 193431935)
#define VER_CPL MS Visual C++ 2022 v17.4.2
#elif (_MSC_FULL_VER >= 193431933)
@ -191,7 +191,7 @@ inline LPCWSTR _Win10BuildToReleaseId(const DWORD build)
#endif
#elif (_MSC_VER == 1929)
#if (_MSC_FULL_VER >= 192930147)
#define VER_CPL MS Visual C++ 2019 v16.11.(21-22)
#define VER_CPL MS Visual C++ 2019 v16.11.(21-23)
#elif (_MSC_FULL_VER >= 192930146)
#define VER_CPL MS Visual C++ 2019 v16.11.(17-20)
#elif (_MSC_FULL_VER >= 192930145)

2
src/VersionEx.h
View File

@ -8,7 +8,7 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 23
#define VERSION_REV 106
#define VERSION_REV 109
#define VERSION_BUILD 1
#define SCINTILLA_VER 532
#define LEXILLA_VER 521