Skip to content

Commit

Permalink
Fix regression that the view cannot be activated by mouse clicking
Browse files Browse the repository at this point in the history
SCI_SETCOMMANDEVENTS cannot be set to false, because SCEN_SETFOCUS is being used by Notepad++

The regression was introduced by commit: notepad-plus-plus@044296e

Fix https://community.notepad-plus-plus.org/topic/25490/notepad-release-8-6-3/7?_=1708380779619
  • Loading branch information
donho committed Feb 19, 2024
1 parent 1491efd commit 827b08f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
1 change: 0 additions & 1 deletion PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 827b08f

Please sign in to comment.