marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Fix positioning of font underlines and strikeouts.

oldstable
Alexandre Julliard 2011-11-07 13:41:18 +01:00
parent 7f17934de2
commit 199409a27b
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/gdi32/font.c
View File

@ -2095,20 +2095,23 @@ done:
{ {
otm = HeapAlloc(GetProcessHeap(), 0, size); otm = HeapAlloc(GetProcessHeap(), 0, size);
GetOutlineTextMetricsW(hdc, size, otm); GetOutlineTextMetricsW(hdc, size, otm);
underlinePos = otm->otmsUnderscorePosition; underlinePos = abs( INTERNAL_YWSTODS( dc, otm->otmsUnderscorePosition ));
underlineWidth = otm->otmsUnderscoreSize; if (otm->otmsUnderscorePosition < 0) underlinePos = -underlinePos;
strikeoutPos = otm->otmsStrikeoutPosition; underlineWidth = abs( INTERNAL_YWSTODS( dc, otm->otmsUnderscoreSize ));
strikeoutWidth = otm->otmsStrikeoutSize; if (otm->otmsUnderscoreSize < 0) underlineWidth = -underlineWidth;
strikeoutPos = abs( INTERNAL_YWSTODS( dc, otm->otmsStrikeoutPosition ));
if (otm->otmsStrikeoutPosition < 0) strikeoutPos = -strikeoutPos;
strikeoutWidth = abs( INTERNAL_YWSTODS( dc, otm->otmsStrikeoutSize ));
HeapFree(GetProcessHeap(), 0, otm); HeapFree(GetProcessHeap(), 0, otm);
} }
if (lf.lfUnderline) if (lf.lfUnderline)
{ {
pts[0].x = x - underlinePos * sinEsc; pts[0].x = x - (underlinePos + underlineWidth / 2) * sinEsc;
pts[0].y = y - underlinePos * cosEsc; pts[0].y = y - (underlinePos + underlineWidth / 2) * cosEsc;
pts[1].x = x + width.x - underlinePos * sinEsc; pts[1].x = x + width.x - (underlinePos + underlineWidth / 2) * sinEsc;
pts[1].y = y + width.y - underlinePos * cosEsc; pts[1].y = y + width.y - (underlinePos + underlineWidth / 2) * cosEsc;
pts[2].x = pts[1].x + underlineWidth * sinEsc; pts[2].x = pts[1].x + underlineWidth * sinEsc;
pts[2].y = pts[1].y + underlineWidth * cosEsc; pts[2].y = pts[1].y + underlineWidth * cosEsc;
pts[3].x = pts[0].x + underlineWidth * sinEsc; pts[3].x = pts[0].x + underlineWidth * sinEsc;
@ -2121,10 +2124,10 @@ done:
if (lf.lfStrikeOut) if (lf.lfStrikeOut)
{ {
pts[0].x = x - strikeoutPos * sinEsc; pts[0].x = x - (strikeoutPos + strikeoutWidth / 2) * sinEsc;
pts[0].y = y - strikeoutPos * cosEsc; pts[0].y = y - (strikeoutPos + strikeoutWidth / 2) * cosEsc;
pts[1].x = x + width.x - strikeoutPos * sinEsc; pts[1].x = x + width.x - (strikeoutPos + strikeoutWidth / 2) * sinEsc;
pts[1].y = y + width.y - strikeoutPos * cosEsc; pts[1].y = y + width.y - (strikeoutPos + strikeoutWidth / 2) * cosEsc;
pts[2].x = pts[1].x + strikeoutWidth * sinEsc; pts[2].x = pts[1].x + strikeoutWidth * sinEsc;
pts[2].y = pts[1].y + strikeoutWidth * cosEsc; pts[2].y = pts[1].y + strikeoutWidth * cosEsc;
pts[3].x = pts[0].x + strikeoutWidth * sinEsc; pts[3].x = pts[0].x + strikeoutWidth * sinEsc;