commit 89075fb429bea37721c44a0b009cf12d19a4b922
author Krzysztof Foltman <kfoltman@portal.onet.pl> Wed Mar 09 11:48:59 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Mar 09 11:48:59 2005 +0000
tree 1852635d0263dee52d35b8edb1a05a7cbc8fe7e4
parent aa5676bd2727f07662c7e070b084891d191cbd0c

The meaning of the rewrap flag got inverted (MEPF_REWRAP instead of
MEPF_WRAPPED) for consistency.
Major code cleanups in rewrap/repaint code, leading to "smarter"
behaviour wrt repainting selections.

dlls/riched20/wrap.c

diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c
index 493b612..bc2420e 100644
--- a/dlls/riched20/wrap.c
+++ b/dlls/riched20/wrap.c
@@ -345,7 +345,7 @@
   ME_WrapContext wc;
 
   assert(tp->type == diParagraph);  
-  if (tp->member.para.nFlags & MEPF_WRAPPED) {
+  if (!(tp->member.para.nFlags & MEPF_REWRAP)) {
     return;
   }
   ME_PrepareParagraphForWrapping(c, tp);
@@ -373,7 +373,7 @@
     p = p->next;
   }
   ME_WrapEndParagraph(&wc, p);
-  tp->member.para.nFlags |= MEPF_WRAPPED;
+  tp->member.para.nFlags &= ~MEPF_REWRAP;
   tp->member.para.nHeight = wc.pt.y;
 }
 
@@ -412,3 +412,38 @@
     }
   }
 }
+
+void ME_WrapMarkedParagraphs(ME_TextEditor *editor) {
+  HWND hWnd = editor->hWnd;
+  HDC hDC = GetDC(hWnd);
+  ME_DisplayItem *item;
+  ME_Context c;
+  
+  ME_InitContext(&c, editor, hDC);
+  c.pt.x = 0;
+  c.pt.y = 0;
+  item = editor->pBuffer->pFirst->next;
+  while(item != editor->pBuffer->pLast) {
+    BOOL bRedraw = FALSE;
+    
+    assert(item->type == diParagraph);
+    if ((item->member.para.nFlags & MEPF_REWRAP)
+     || (item->member.para.nYPos != c.pt.y))
+      bRedraw = TRUE;
+    item->member.para.nYPos = c.pt.y;
+    
+    ME_WrapTextParagraph(&c, item);
+
+    if (bRedraw)
+      item->member.para.nFlags |= MEPF_REPAINT;
+
+    c.pt.y += item->member.para.nHeight;
+    item = item->member.para.next_para;
+  }
+  editor->sizeWindow.cx = c.rcView.right-c.rcView.left;
+  editor->sizeWindow.cy = c.rcView.bottom-c.rcView.top;
+  editor->nTotalLength = c.pt.y-c.rcView.top;
+  
+  ME_DestroyContext(&c);
+  ReleaseDC(hWnd, hDC);
+}