ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

riched20: The new eop style when typing a list is a copy of the existing eop style.

Browse Source 
Normally the new eop style is the insert style, however in a list the existing eop
style is used.  This prevents the list label style from changing when the new eop
is inserted.

Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Huw Davies 2016-10-11 13:03:59 +01:00 committed by Alexandre Julliard
parent 9a1cc45edd
commit 2019ec38db
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/riched20/editor.c
View File

@ -2404,7 +2404,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey)
int from, to; int from, to;
const WCHAR endl = '\r'; const WCHAR endl = '\r';
const WCHAR endlv10[] = {'\r','\n'}; const WCHAR endlv10[] = {'\r','\n'};
ME_Style *style; ME_Style *style, *eop_style;
if (editor->styleFlags & ES_READONLY) { if (editor->styleFlags & ES_READONLY) {
MessageBeep(MB_ICONERROR); MessageBeep(MB_ICONERROR);
@ -2501,14 +2501,22 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey)
} }
style = ME_GetInsertStyle(editor, 0); style = ME_GetInsertStyle(editor, 0);
/* Normally the new eop style is the insert style, however in a list it is copied from the existing
eop style (this prevents the list label style changing when the new eop is inserted).
No extra ref is taken here on eop_style. */
if (para->member.para.fmt.wNumbering)
eop_style = para->member.para.eop_run->style;
else
eop_style = style;
ME_ContinueCoalescingTransaction(editor); ME_ContinueCoalescingTransaction(editor);
if (shift_is_down) if (shift_is_down)
ME_InsertEndRowFromCursor(editor, 0); ME_InsertEndRowFromCursor(editor, 0);
else else
if (!editor->bEmulateVersion10) if (!editor->bEmulateVersion10)
ME_InsertTextFromCursor(editor, 0, &endl, 1, style); ME_InsertTextFromCursor(editor, 0, &endl, 1, eop_style);
else else
ME_InsertTextFromCursor(editor, 0, endlv10, 2, style); ME_InsertTextFromCursor(editor, 0, endlv10, 2, eop_style);
ME_CommitCoalescingUndo(editor); ME_CommitCoalescingUndo(editor);
SetCursor(NULL); SetCursor(NULL);