CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

+fix: workaround for additional selection typing issue (#3556)

Browse Source
This commit is contained in:
METANEOCORTEX\Kotti 2021-08-09 15:24:29 +02:00
parent 9ab602a7b7
commit 2ed27da2d8
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Notepad3.c
View File

@ -7493,11 +7493,18 @@ inline static LRESULT _MsgNotifyLean(const SCNotification *const scn, bool* bMod
if (iModType & (SC_MOD_BEFOREINSERT | SC_MOD_BEFOREDELETE)) {
if (!(iModType & (SC_PERFORMED_UNDO | SC_PERFORMED_REDO))) {
if (!_InUndoRedoTransaction() && (_mod_insdel_token < 0)) {
if (!SciCall_IsSelectionEmpty() || Sci_IsMultiOrRectangleSelection()) {
bool const bIsSelEmpty = !SciCall_IsSelectionEmpty();
bool const bIsMultiRectSel = Sci_IsMultiOrRectangleSelection();
if (bIsSelEmpty || bIsMultiRectSel) {
int const tok = _SaveUndoSelection();
if (tok >= 0) {
_mod_insdel_token = tok;
}
_mod_insdel_token = (tok >= 0) ? tok : _mod_insdel_token;
}
// TODO: @@@ Find reason for why this NOP workaround is needed:
if (bIsSelEmpty && bIsMultiRectSel) {
// need to trigger SCI:InvalidateCaret()
bool const bAddSelTyping = SciCall_GetAdditionalSelectionTyping();
//~SciCall_SetAdditionalSelectionTyping(!bAddSelTyping); // v5.1.1: no check for change, so:
SciCall_SetAdditionalSelectionTyping(bAddSelTyping);
}
}
}
@ -7848,9 +7855,7 @@ LRESULT MsgNotify(HWND hwnd, WPARAM wParam, LPARAM lParam)
UNREFERENCED_PARAMETER(wParam);
LRESULT result = FALSE;
static bool _guard = false;
if (_guard) { return result; }
_guard = true;
SET_FCT_GUARD(result)
const SCNotification* const scn = (SCNotification*)lParam;
@ -8067,7 +8072,7 @@ LRESULT MsgNotify(HWND hwnd, WPARAM wParam, LPARAM lParam)
break;
}
_guard = false; // reset
RESET_FCT_GUARD();
return result;
}