From 4c322698dad93edccc55c1462e7d8428a3177ffb Mon Sep 17 00:00:00 2001 From: Huw Davies Date: Tue, 4 Oct 2016 13:07:31 +0100 Subject: [PATCH] riched20: Set the end-of-paragraph run width to that of a space. Signed-off-by: Huw Davies Signed-off-by: Alexandre Julliard --- dlls/riched20/run.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 778a95265ea..984f8f55862 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -611,17 +611,16 @@ SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, i int startx, int *pAscent, int *pDescent) { SIZE size; - int nMaxLen = run->len; + WCHAR spaceW[] = {' ',0}; - if (nLen>nMaxLen) - nLen = nMaxLen; + nLen = min( nLen, run->len ); - /* FIXME the following call also ensures that TEXTMETRIC structure is filled - * this is wasteful for MERF_NONTEXT runs, but that shouldn't matter - * in practice - */ - - if (para->nFlags & MEPF_COMPLEX) + if (run->nFlags & MERF_ENDPARA) + { + nLen = min( nLen, 1 ); + ME_GetTextExtent(c, spaceW, nLen, run->style, &size); + } + else if (para->nFlags & MEPF_COMPLEX) { size.cx = run->nWidth; }