system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 11:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

riched20: Simplify the code by accessing paragraphs directly from runs.

Browse source
This commit is contained in:
Huw Davies 2014-01-07 12:44:20 +00:00 committed by Alexandre Julliard
parent 996b3c87f1
commit 7e7a8f1a4e
1 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
dlls/riched20/run.c
View file

@ -658,9 +658,7 @@ void ME_SetSelectionCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt)
*/ */
void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, CHARFORMAT2W *pFmt) void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, CHARFORMAT2W *pFmt)
{ {
ME_DisplayItem *para; ME_DisplayItem *run, *end_run = NULL;
ME_DisplayItem *run;
ME_DisplayItem *end_run = NULL;
if (end && start->pRun == end->pRun && start->nOffset == end->nOffset) if (end && start->pRun == end->pRun && start->nOffset == end->nOffset)
return; return;
@ -682,27 +680,15 @@ void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, C
ME_SplitRunSimple(editor, end); ME_SplitRunSimple(editor, end);
end_run = end ? end->pRun : NULL; end_run = end ? end->pRun : NULL;
run = start->pRun; for (run = start->pRun; run != end_run; run = ME_FindItemFwd( run, diRun ))
para = start->pPara;
para->member.para.nFlags |= MEPF_REWRAP;
while(run != end_run)
{ {
ME_Style *new_style = ME_ApplyStyle(run->member.run.style, pFmt); ME_Style *new_style = ME_ApplyStyle(run->member.run.style, pFmt);
/* ME_DumpStyle(new_style); */
add_undo_set_char_fmt( editor, para->member.para.nCharOfs + run->member.run.nCharOfs, add_undo_set_char_fmt( editor, run->member.run.para->nCharOfs + run->member.run.nCharOfs,
run->member.run.len, &run->member.run.style->fmt ); run->member.run.len, &run->member.run.style->fmt );
ME_ReleaseStyle(run->member.run.style); ME_ReleaseStyle(run->member.run.style);
run->member.run.style = new_style; run->member.run.style = new_style;
run = ME_FindItemFwd(run, diRunOrParagraph); run->member.run.para->nFlags |= MEPF_REWRAP;
if (run && run->type == diParagraph)
{
para = run;
run = ME_FindItemFwd(run, diRun);
if (run != end_run)
para->member.para.nFlags |= MEPF_REWRAP;
}
} }
} }