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

richedit: Now painting the newly supported underline types.

This commit is contained in:
Eric Pouech 2008-01-01 22:04:04 +01:00 committed by Alexandre Julliard
parent 6b591ef23a
commit 2602a39bd9
1 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
dlls/riched20/paint.c
View File

@ -148,14 +148,18 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, in
HGDIOBJ hOldFont; HGDIOBJ hOldFont;
COLORREF rgbOld, rgbBack; COLORREF rgbOld, rgbBack;
int yOffset = 0, yTwipsOffset = 0; int yOffset = 0, yTwipsOffset = 0;
SIZE sz;
COLORREF rgb;
hOldFont = ME_SelectStyleFont(c->editor, hDC, s); hOldFont = ME_SelectStyleFont(c->editor, hDC, s);
rgbBack = ME_GetBackColor(c->editor); rgbBack = ME_GetBackColor(c->editor);
if ((s->fmt.dwMask & CFM_LINK) && (s->fmt.dwEffects & CFE_LINK)) if ((s->fmt.dwMask & CFM_LINK) && (s->fmt.dwEffects & CFE_LINK))
rgbOld = SetTextColor(hDC, RGB(0,0,255)); rgb = RGB(0,0,255);
else if ((s->fmt.dwMask & CFM_COLOR) && (s->fmt.dwEffects & CFE_AUTOCOLOR)) else if ((s->fmt.dwMask & CFM_COLOR) && (s->fmt.dwEffects & CFE_AUTOCOLOR))
rgbOld = SetTextColor(hDC, GetSysColor(COLOR_WINDOWTEXT)); rgb = GetSysColor(COLOR_WINDOWTEXT);
else else
rgbOld = SetTextColor(hDC, s->fmt.crTextColor); rgb = s->fmt.crTextColor;
rgbOld = SetTextColor(hDC, rgb);
if ((s->fmt.dwMask & s->fmt.dwEffects) & CFM_OFFSET) { if ((s->fmt.dwMask & s->fmt.dwEffects) & CFM_OFFSET) {
yTwipsOffset = s->fmt.yOffset; yTwipsOffset = s->fmt.yOffset;
} }
@ -176,14 +180,41 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, in
yOffset = yTwipsOffset * GetDeviceCaps(hDC, LOGPIXELSY) * numerator / denominator / 1440; yOffset = yTwipsOffset * GetDeviceCaps(hDC, LOGPIXELSY) * numerator / denominator / 1440;
} }
ExtTextOutW(hDC, x, y-yOffset, 0, NULL, szText, nChars, NULL); ExtTextOutW(hDC, x, y-yOffset, 0, NULL, szText, nChars, NULL);
if (width) { GetTextExtentPoint32W(hDC, szText, nChars, &sz);
SIZE sz; if (width) *width = sz.cx;
GetTextExtentPoint32W(hDC, szText, nChars, &sz); if (s->fmt.dwMask & CFM_UNDERLINETYPE)
*width = sz.cx; {
HPEN hPen;
switch (s->fmt.bUnderlineType)
{
case CFU_UNDERLINE:
case CFU_UNDERLINEWORD: /* native seems to map it to simple underline (MSDN) */
case CFU_UNDERLINEDOUBLE: /* native seems to map it to simple underline (MSDN) */
hPen = CreatePen(PS_SOLID, 1, rgb);
break;
case CFU_UNDERLINEDOTTED:
hPen = CreatePen(PS_DOT, 1, rgb);
break;
default:
WINE_FIXME("Unknown underline type (%u)\n", s->fmt.bUnderlineType);
/* fall through */
case CFU_CF1UNDERLINE: /* this type is supported in the font, do nothing */
case CFU_UNDERLINENONE:
hPen = NULL;
break;
}
if (hPen != NULL)
{
HPEN hOldPen = SelectObject(hDC, hPen);
/* FIXME: should use textmetrics info for Descent info */
MoveToEx(hDC, x, y - yOffset + 1, NULL);
LineTo(hDC, x + sz.cx, y - yOffset + 1);
SelectObject(hDC, hOldPen);
DeleteObject(hPen);
}
} }
if (nSelFrom < nChars && nSelTo >= 0 && nSelFrom<nSelTo) if (nSelFrom < nChars && nSelTo >= 0 && nSelFrom<nSelTo)
{ {
SIZE sz;
if (nSelFrom < 0) nSelFrom = 0; if (nSelFrom < 0) nSelFrom = 0;
if (nSelTo > nChars) nSelTo = nChars; if (nSelTo > nChars) nSelTo = nChars;
GetTextExtentPoint32W(hDC, szText, nSelFrom, &sz); GetTextExtentPoint32W(hDC, szText, nSelFrom, &sz);