richedit: Avoid redundant calls to ME_CalcRunExtent.

ME_SplitRun is only called by wrapping code. In all but one call the returned second half of the split run will be returned, get passed back to ME_WrapHandleRun, then ME_CalcRunExtent will be called at the start of ME_WrapHandleRun through ME_WrapSizeRun.

richedit: Avoid redundant calls to ME_CalcRunExtent.
c0ee555e · Dylan Smith · Alexandre Julliard · 8b8e4f89 · c0ee555e · c0ee555e
Commit c0ee555e authored Jul 29, 2010 by Dylan Smith Committed by Alexandre Julliard Jul 30, 2010
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

run.c dlls/riched20/run.c +0 -1

wrap.c dlls/riched20/wrap.c +3 -0

No files found.
--- a/dlls/riched20/run.c
+++ b/dlls/riched20/run.c
@@ -273,7 +273,6 @@ ME_DisplayItem *ME_SplitRun(ME_WrapContext *wc, ME_DisplayItem *item, int nVChar
  run2 = &cursor.pRun->member.run;

  ME_CalcRunExtent(wc->context, para, wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, run);
-  ME_CalcRunExtent(wc->context, para, wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, run2);

  run2->pt.x = run->pt.x+run->nWidth;
  run2->pt.y = run->pt.y;

--- a/dlls/riched20/wrap.c
+++ b/dlls/riched20/wrap.c
@@ -361,6 +361,9 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p)
      if (black) {
        wc->bOverflown = FALSE;
        pp = ME_SplitRun(wc, p, black);
+        ME_CalcRunExtent(wc->context, &wc->pPara->member.para,
+                         wc->nRow ? wc->nLeftMargin : wc->nFirstMargin,
+                         &pp->member.run);
        ME_InsertRowStart(wc, pp);
        return pp;
      }