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

richedit: Never wrap for single line controls. 

I tested without the ES_MULTILINE style, and found that wrapping
doesn't occur where it normally would.
This commit is contained in:
Dylan Smith 2009-02-24 02:56:18 -05:00 committed by Alexandre Julliard
parent 963407a9ef
commit 73e0c5ea8b
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/riched20/editor.c
View File

@ -2636,7 +2636,6 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10)
ed->nLastSelStart = ed->nLastSelEnd = 0; ed->nLastSelStart = ed->nLastSelEnd = 0;
ed->pLastSelStartPara = ed->pLastSelEndPara = ME_FindItemFwd(ed->pBuffer->pFirst, diParagraph); ed->pLastSelStartPara = ed->pLastSelEndPara = ME_FindItemFwd(ed->pBuffer->pFirst, diParagraph);
ed->nAvailWidth = 0; /* wrap to client area */ ed->nAvailWidth = 0; /* wrap to client area */
ed->bWordWrap = (props & TXTBIT_WORDWRAP) != 0;
ed->bHideSelection = FALSE; ed->bHideSelection = FALSE;
ed->pfnWordBreak = NULL; ed->pfnWordBreak = NULL;
ed->lpOleCallback = NULL; ed->lpOleCallback = NULL;
@ -2665,8 +2664,12 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10)
if (props & TXTBIT_AUTOWORDSEL) if (props & TXTBIT_AUTOWORDSEL)
ed->styleFlags |= ECO_AUTOWORDSELECTION; ed->styleFlags |= ECO_AUTOWORDSELECTION;
if (props & TXTBIT_MULTILINE) if (props & TXTBIT_MULTILINE) {
ed->styleFlags |= ES_MULTILINE; ed->styleFlags |= ES_MULTILINE;
ed->bWordWrap = (props & TXTBIT_WORDWRAP) != 0;
} else {
ed->bWordWrap = FALSE;
}
if (props & TXTBIT_READONLY) if (props & TXTBIT_READONLY)
ed->styleFlags |= ES_READONLY; ed->styleFlags |= ES_READONLY;
if (!(props & TXTBIT_HIDESELECTION)) if (!(props & TXTBIT_HIDESELECTION))
@ -4296,7 +4299,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam,
case EM_SETTARGETDEVICE: case EM_SETTARGETDEVICE:
if (wParam == 0) if (wParam == 0)
{ {
BOOL new = (lParam == 0); BOOL new = (lParam == 0 && (editor->styleFlags & ES_MULTILINE));
if (editor->nAvailWidth || editor->bWordWrap != new) if (editor->nAvailWidth || editor->bWordWrap != new)
{ {
editor->bWordWrap = new; editor->bWordWrap = new;
@ -4305,7 +4308,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam,
} }
} else { } else {
int width = max(0, lParam); int width = max(0, lParam);
if (!editor->bWordWrap || editor->nAvailWidth != width) if ((editor->styleFlags & ES_MULTILINE) &&
(!editor->bWordWrap || editor->nAvailWidth != width))
{ {
editor->nAvailWidth = width; editor->nAvailWidth = width;
editor->bWordWrap = TRUE; editor->bWordWrap = TRUE;