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

richedit: Remove always FALSE parameter from ME_PaintContent.

This commit is contained in:
Dylan Smith 2012-05-07 22:11:55 -04:00 committed by Alexandre Julliard
parent 9af543aad8
commit 18fa3287f6
4 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/riched20/editor.c
View File

@ -4463,7 +4463,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam,
ps.rcPaint.right = editor->rcFormat.right; ps.rcPaint.right = editor->rcFormat.right;
} }
ME_PaintContent(editor, hDC, FALSE, &ps.rcPaint); ME_PaintContent(editor, hDC, &ps.rcPaint);
EndPaint(editor->hWnd, &ps); EndPaint(editor->hWnd, &ps);
return 0; return 0;
} }

2
dlls/riched20/editor.h
View File

@ -207,7 +207,7 @@ void ME_MarkAllForWrapping(ME_TextEditor *editor) DECLSPEC_HIDDEN;
void ME_SetDefaultParaFormat(PARAFORMAT2 *pFmt) DECLSPEC_HIDDEN; void ME_SetDefaultParaFormat(PARAFORMAT2 *pFmt) DECLSPEC_HIDDEN;
/* paint.c */ /* paint.c */
void ME_PaintContent(ME_TextEditor *editor, HDC hDC, BOOL bOnlyNew, const RECT *rcUpdate) DECLSPEC_HIDDEN; void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) DECLSPEC_HIDDEN;
void ME_Repaint(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_Repaint(ME_TextEditor *editor) DECLSPEC_HIDDEN;
void ME_RewrapRepaint(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_RewrapRepaint(ME_TextEditor *editor) DECLSPEC_HIDDEN;
void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now) DECLSPEC_HIDDEN; void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now) DECLSPEC_HIDDEN;

14
dlls/riched20/paint.c
View File

@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit);
static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph); static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph);
void ME_PaintContent(ME_TextEditor *editor, HDC hDC, BOOL bOnlyNew, const RECT *rcUpdate) void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate)
{ {
ME_DisplayItem *item; ME_DisplayItem *item;
ME_Context c; ME_Context c;
@ -71,8 +71,6 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, BOOL bOnlyNew, const RECT *
ys -= item->member.para.pCell->member.cell.yTextOffset; ys -= item->member.para.pCell->member.cell.yTextOffset;
} }
if (!bOnlyNew || (item->member.para.nFlags & MEPF_REPAINT))
{
/* Draw the paragraph if any of the paragraph is in the update region. */ /* Draw the paragraph if any of the paragraph is in the update region. */
if (ys < rcUpdate->bottom && ye > rcUpdate->top) if (ys < rcUpdate->bottom && ye > rcUpdate->top)
{ {
@ -82,7 +80,6 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, BOOL bOnlyNew, const RECT *
if (rcUpdate->top <= ys && rcUpdate->bottom >= ye) if (rcUpdate->top <= ys && rcUpdate->bottom >= ye)
item->member.para.nFlags &= ~MEPF_REPAINT; item->member.para.nFlags &= ~MEPF_REPAINT;
} }
}
item = item->member.para.next_para; item = item->member.para.next_para;
} }
if (c.pt.y + editor->nTotalLength < c.rcView.bottom) if (c.pt.y + editor->nTotalLength < c.rcView.bottom)
@ -94,15 +91,6 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, BOOL bOnlyNew, const RECT *
rc.bottom = c.rcView.bottom; rc.bottom = c.rcView.bottom;
rc.right = c.rcView.right; rc.right = c.rcView.right;
if (bOnlyNew)
{
/* Only erase region drawn from previous call to ME_PaintContent */
if (editor->nTotalLength < editor->nLastTotalLength)
rc.bottom = c.pt.y + editor->nLastTotalLength;
else
SetRectEmpty(&rc);
}
IntersectRect(&rc, &rc, rcUpdate); IntersectRect(&rc, &rc, rcUpdate);
if (!IsRectEmpty(&rc)) if (!IsRectEmpty(&rc))

1
dlls/riched20/wrap.c
View File

@ -753,6 +753,7 @@ void ME_InvalidateMarkedParagraphs(ME_TextEditor *editor)
+ item->member.para.nHeight - ofs, + item->member.para.nHeight - ofs,
c.rcView.bottom); c.rcView.bottom);
ITextHost_TxInvalidateRect(editor->texthost, &rc, TRUE); ITextHost_TxInvalidateRect(editor->texthost, &rc, TRUE);
item->member.para.nFlags &= ~MEPF_REPAINT;
} }
item = item->member.para.next_para; item = item->member.para.next_para;
} }