From 827b08f6ff322020415cad9cbc3d08e1c2345b7c Mon Sep 17 00:00:00 2001 From: Don Ho Date: Mon, 19 Feb 2024 23:27:48 +0100 Subject: [PATCH] Fix regression that the view cannot be activated by mouse clicking SCI_SETCOMMANDEVENTS cannot be set to false, because SCEN_SETFOCUS is being used by Notepad++ The regression was introduced by commit: https://github.com/notepad-plus-plus/notepad-plus-plus/commit/044296eea19873e5d7fd15cfac7dd6776aae8ff3 Fix https://community.notepad-plus-plus.org/topic/25490/notepad-release-8-6-3/7?_=1708380779619 --- PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp | 1 - PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp b/PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp index 106d2cbe9dbc..a6909f526b15 100644 --- a/PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp +++ b/PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp @@ -236,7 +236,6 @@ void ScintillaEditView::init(HINSTANCE hInst, HWND hPere) // Set only the notification we need. execute(SCI_SETMODEVENTMASK, SC_MOD_DELETETEXT | SC_MOD_INSERTTEXT | SC_PERFORMED_UNDO | SC_PERFORMED_REDO | SC_MOD_CHANGEINDICATOR); - execute(SCI_SETCOMMANDEVENTS, false); execute(SCI_SETMARGINMASKN, _SC_MARGE_FOLDER, SC_MASK_FOLDERS); showMargin(_SC_MARGE_FOLDER, true); diff --git a/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp b/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp index fbecf2e9afee..24dc4d3a6ae0 100644 --- a/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp +++ b/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp @@ -222,8 +222,7 @@ intptr_t CALLBACK DebugInfoDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM constexpr size_t bufSizeUBR = 12; TCHAR szUBR[bufSizeUBR] = TEXT("0"); - // NOTE: RegQueryValueExW is not guaranteed to return null-ter - // minated strings + // NOTE: RegQueryValueExW is not guaranteed to return null-terminated strings if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"), 0, KEY_READ, &hKey) == ERROR_SUCCESS) { dataSize = sizeof(szProductName);