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

Merge branch 'Bugfixes' into Scintilla_400

Browse Source
This commit is contained in:
Rainer Kottenhoff 2017-08-16 21:57:58 +02:00
commit f56e64b6bf
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Notepad3.c
View File

@ -5443,7 +5443,7 @@ LRESULT MsgNotify(HWND hwnd,WPARAM wParam,LPARAM lParam)
{
if (scn->modificationType & SC_PERFORMED_UNDO)
{
ResroreSelectionAction(scn->token);
RestoreSelectionAction(scn->token);
}
//else if (scn->modificationType & SC_PERFORMED_REDO) {
// REDO of ADDUNDOACTION step
@ -7029,22 +7029,25 @@ void EndSelUndoAction(int token)
//=============================================================================
//
// ResroreSelectionAction()
// RestoreSelectionAction()
//
//
void ResroreSelectionAction(int token)
void RestoreSelectionAction(int token)
{
UndoRedoSelection sel = { -1,-1,-1 };
if (UndoSelectionMap(token, &sel) >= 0) {
// we are inside undo transaction, so do delayed PostMessage() instead of SendMessage()
int currSelMode = (int)SendMessage(hwndEdit, SCI_GETSELECTIONMODE, 0, 0);
PostMessage(hwndEdit, SCI_SETSELECTIONMODE, (WPARAM)sel.selMode, 0);
if (sel.selMode == SC_SEL_RECTANGLE) {
if (sel.selMode == SC_SEL_RECTANGLE)
{
PostMessage(hwndEdit, SCI_SETRECTANGULARSELECTIONANCHOR, (WPARAM)sel.anchorPos, 0);
PostMessage(hwndEdit, SCI_SETRECTANGULARSELECTIONCARET, (WPARAM)sel.currPos, 0);
}
else {
PostMessage(hwndEdit, SCI_SETSELECTION, (WPARAM)sel.currPos, (LPARAM)sel.anchorPos);
}
PostMessage(hwndEdit, SCI_SETSELECTIONMODE, (WPARAM)currSelMode, 0);
}
}

2
src/Notepad3.h
View File

@ -135,7 +135,7 @@ void UpdateSettingsCmds();
void InvalidateSelections();
int BeginSelUndoAction();
void EndSelUndoAction(int);
void ResroreSelectionAction(int);
void RestoreSelectionAction(int);
int UndoSelectionMap(int, LPUndoRedoSelection);