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

Merge pull request #1568 from RaiKoHoff/DevNewFeatures

Browse Source 
Fix: TAB behavior after multi-selection undo sequence
This commit is contained in:
Rainer Kottenhoff 2019-08-28 18:56:56 +02:00 committed by GitHub
commit 5f8aa1c625
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Versions/build.txt
View File

@ -1 +1 @@
2604
2605

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

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.19.828.2604"
version="5.19.828.2605"
type="win32"
/>
<description>Notepad3 BETA</description>

4
src/Edit.c
View File

@ -2749,6 +2749,8 @@ void EditIndentBlock(HWND hwnd, int cmd, bool bFormatIndentation, bool bForceAll
return;
}
_BEGIN_UNDO_ACTION_
DocPos const iInitialPos = SciCall_GetCurrentPos();
if (bForceAll) { SciCall_SelectAll(); }
@ -2820,6 +2822,8 @@ void EditIndentBlock(HWND hwnd, int cmd, bool bFormatIndentation, bool bForceAll
else {
EditSetSelectionEx(hwnd, iInitialPos, iInitialPos, -1, -1);
}
_END_UNDO_ACTION_
}

41
src/Notepad3.c
View File

@ -3483,7 +3483,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
CancelCallTip();
break;
case IDT_TIMER_UNDO_REDO_SPLIT:
case IDT_TIMER_UNDO_TRANSACTION:
_SplitUndoTransaction((int)lParam);
break;
@ -4072,45 +4072,35 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
case IDM_EDIT_INDENT:
{
_BEGIN_UNDO_ACTION_
EditIndentBlock(Globals.hwndEdit, SCI_TAB, true, false);
_END_UNDO_ACTION_
}
break;
case IDM_EDIT_UNINDENT:
{
_BEGIN_UNDO_ACTION_
EditIndentBlock(Globals.hwndEdit, SCI_BACKTAB, true, false);
_END_UNDO_ACTION_
}
break;
case CMD_TAB:
{
_BEGIN_UNDO_ACTION_
EditIndentBlock(Globals.hwndEdit, SCI_TAB, false, false);
_END_UNDO_ACTION_
}
break;
case CMD_BACKTAB:
{
_BEGIN_UNDO_ACTION_
EditIndentBlock(Globals.hwndEdit, SCI_BACKTAB, false, false);
_END_UNDO_ACTION_
EditIndentBlock(Globals.hwndEdit, SCI_BACKTAB, false, false);
}
break;
case CMD_CTRLTAB:
{
_BEGIN_UNDO_ACTION_
SciCall_SetUseTabs(true);
SciCall_SetTabIndents(false);
EditIndentBlock(Globals.hwndEdit, SCI_TAB, false, false);
SciCall_SetTabIndents(Globals.fvCurFile.bTabIndents);
SciCall_SetUseTabs(!Globals.fvCurFile.bTabsAsSpaces);
_END_UNDO_ACTION_
}
break;
@ -8048,17 +8038,17 @@ static void _DelayClearZoomCallTip(int delay)
//=============================================================================
//
// _DelayClearZoomCallTip()
// _DelaySplitUndoTransaction()
//
//
static void _DelaySplitUndoTransaction(int delay, int iModType)
{
static CmdMessageQueue_t mqc = MQ_WM_CMD_INIT(IDT_TIMER_UNDO_REDO_SPLIT, 0);
mqc.hwnd = Globals.hwndMain;
static CmdMessageQueue_t mqc = MQ_WM_CMD_INIT(IDT_TIMER_UNDO_TRANSACTION, 0);
if (!((iModType & SC_PERFORMED_UNDO) || (iModType & SC_PERFORMED_REDO))) {
mqc.hwnd = Globals.hwndMain;
mqc.lparam = (LPARAM)iModType;
_MQ_AppendCmd(&mqc, (UINT)(delay <= 0 ? 0 : _MQ_ms(delay)));
}
_MQ_AppendCmd(&mqc, (UINT)(delay <= 0 ? 0 : _MQ_ms(delay)));
}
@ -9186,7 +9176,8 @@ bool RestoreAction(int token, DoAction doAct)
pPosAnchorVS = (DocPos*)((UNDO == doAct) ? utarray_front(pSel->anchorVS_undo) : utarray_front(pSel->anchorVS_redo));
pPosCurVS = (DocPos*)((UNDO == doAct) ? utarray_front(pSel->curVS_undo) : utarray_front(pSel->curVS_redo));
if (pPosAnchor && pPosCur) {
if (pPosAnchor && pPosCur)
{
// Ensure that the first and last lines of a selection are always unfolded
// This needs to be done _before_ the SCI_SETSEL message
DocLn const anchorPosLine = SciCall_LineFromPosition((*pPosAnchor));
@ -9203,16 +9194,19 @@ bool RestoreAction(int token, DoAction doAct)
{
case NP3_SEL_MULTI:
{
unsigned int i = 0;
DocPosU const selCount = (UNDO == doAct) ? utarray_len(pSel->anchorPos_undo) : utarray_len(pSel->anchorPos_redo);
DocPosU const selCountVS = (UNDO == doAct) ? utarray_len(pSel->anchorVS_undo) : utarray_len(pSel->anchorVS_redo);
PostMessage(hwndedit, SCI_SETSELECTION, (WPARAM)(*pPosCur), (LPARAM)(*pPosAnchor));
if (pPosAnchorVS && pPosCurVS) {
PostMessage(hwndedit, SCI_SETSELECTIONNANCHORVIRTUALSPACE, (WPARAM)0, (LPARAM)(*pPosAnchorVS));
PostMessage(hwndedit, SCI_SETSELECTIONNCARETVIRTUALSPACE, (WPARAM)0, (LPARAM)(*pPosCurVS));
}
DocPosU const selCount = (UNDO == doAct) ? utarray_len(pSel->anchorPos_undo) : utarray_len(pSel->anchorPos_redo);
DocPosU const selCountVS = (UNDO == doAct) ? utarray_len(pSel->anchorVS_undo) : utarray_len(pSel->anchorVS_redo);
unsigned int i = 1;
PostMessage(hwndedit, SCI_CANCEL, 0, 0); // (!) else shift-key selection behavior is kept
++i;
while (i < selCount)
{
pPosAnchor = (DocPos*)((UNDO == doAct) ? utarray_eltptr(pSel->anchorPos_undo, i) : utarray_eltptr(pSel->anchorPos_redo, i));
@ -9230,6 +9224,7 @@ bool RestoreAction(int token, DoAction doAct)
}
++i;
}
//~PostMessage(hwndedit, SCI_SETMAINSELECTION, (WPARAM)0, (LPARAM)0);
}
break;
@ -9393,10 +9388,8 @@ bool ConsistentIndentationCheck(EditFileIOStatus* status)
SciCall_SetBackSpaceUnIndents(true);
BeginWaitCursor(NULL);
_BEGIN_UNDO_ACTION_
EditIndentBlock(Globals.hwndEdit, SCI_TAB, true, true);
EditIndentBlock(Globals.hwndEdit, SCI_BACKTAB, true, true);
_END_UNDO_ACTION_
EndWaitCursor();
SciCall_SetUseTabs(useTabs);

2
src/VersionEx.h
View File

@ -8,7 +8,7 @@
#define VERSION_MAJOR 5
#define VERSION_MINOR 19
#define VERSION_REV 828
#define VERSION_BUILD 2604
#define VERSION_BUILD 2605
#define SCINTILLA_VER 420
#define ONIGURUMA_REGEX_VER 6.9.3
#define UCHARDET_VER 2018.09.27

2
src/resource.h
View File

@ -31,7 +31,7 @@
#define IDT_TIMER_UPDATE_STATUSBAR 236
#define IDT_TIMER_UPDATE_TOOLBAR 237
#define IDT_TIMER_CLEAR_CALLTIP 238
#define IDT_TIMER_UNDO_REDO_SPLIT 239
#define IDT_TIMER_UNDO_TRANSACTION 239
#define IDACC_FIND 302
#define IDACC_REPLACE 303