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

gdiplus: Don't position characters by glyph metrics in GdipAddPathString.

Browse Source
This commit is contained in:
Vincent Povirk 2012-06-21 15:49:39 -05:00 committed by Alexandre Julliard
parent cae52d078a
commit 3cde67e144
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/gdiplus/graphicspath.c
View File

@ -842,6 +842,7 @@ struct format_string_args
GpPath *path; GpPath *path;
float maxY; float maxY;
float scale; float scale;
float ascent;
}; };
static GpStatus format_string_callback(HDC dc, static GpStatus format_string_callback(HDC dc,
@ -861,13 +862,15 @@ static GpStatus format_string_callback(HDC dc,
if (underlined_index_count) if (underlined_index_count)
FIXME("hotkey underlines not drawn yet\n"); FIXME("hotkey underlines not drawn yet\n");
if (y + bounds->Height * args->scale > args->maxY)
args->maxY = y + bounds->Height * args->scale;
for (i = index; i < length; ++i) for (i = index; i < length; ++i)
{ {
GLYPHMETRICS gm; GLYPHMETRICS gm;
TTPOLYGONHEADER *ph = NULL; TTPOLYGONHEADER *ph = NULL;
char *start; char *start;
DWORD len, ofs = 0; DWORD len, ofs = 0;
float bb_end;
len = GetGlyphOutlineW(dc, string[i], GGO_BEZIER, &gm, 0, NULL, &identity); len = GetGlyphOutlineW(dc, string[i], GGO_BEZIER, &gm, 0, NULL, &identity);
if (len == GDI_ERROR) if (len == GDI_ERROR)
{ {
@ -882,9 +885,6 @@ static GpStatus format_string_callback(HDC dc,
break; break;
} }
GetGlyphOutlineW(dc, string[i], GGO_BEZIER, &gm, len, start, &identity); GetGlyphOutlineW(dc, string[i], GGO_BEZIER, &gm, len, start, &identity);
bb_end = (gm.gmBlackBoxY + gm.gmptGlyphOrigin.y) * args->scale;
if (bb_end + y > args->maxY)
args->maxY = bb_end + y;
ofs = 0; ofs = 0;
while (ofs < len) while (ofs < len)
@ -893,7 +893,7 @@ static GpStatus format_string_callback(HDC dc,
ph = (TTPOLYGONHEADER*)&start[ofs]; ph = (TTPOLYGONHEADER*)&start[ofs];
path->pathdata.Types[path->pathdata.Count] = PathPointTypeStart; path->pathdata.Types[path->pathdata.Count] = PathPointTypeStart;
path->pathdata.Points[path->pathdata.Count].X = x + fromfixedpoint(ph->pfxStart.x) * args->scale; path->pathdata.Points[path->pathdata.Count].X = x + fromfixedpoint(ph->pfxStart.x) * args->scale;
path->pathdata.Points[path->pathdata.Count++].Y = y + bb_end - fromfixedpoint(ph->pfxStart.y) * args->scale; path->pathdata.Points[path->pathdata.Count++].Y = y + args->ascent - fromfixedpoint(ph->pfxStart.y) * args->scale;
TRACE("Starting at count %i with pos %f, %f)\n", path->pathdata.Count, x, y); TRACE("Starting at count %i with pos %f, %f)\n", path->pathdata.Count, x, y);
ofs += sizeof(*ph); ofs += sizeof(*ph);
while (ofs - ofs_start < ph->cb) while (ofs - ofs_start < ph->cb)
@ -909,7 +909,7 @@ static GpStatus format_string_callback(HDC dc,
{ {
path->pathdata.Types[path->pathdata.Count] = PathPointTypeLine; path->pathdata.Types[path->pathdata.Count] = PathPointTypeLine;
path->pathdata.Points[path->pathdata.Count].X = x + fromfixedpoint(curve->apfx[j].x) * args->scale; path->pathdata.Points[path->pathdata.Count].X = x + fromfixedpoint(curve->apfx[j].x) * args->scale;
path->pathdata.Points[path->pathdata.Count++].Y = y + bb_end - fromfixedpoint(curve->apfx[j].y) * args->scale; path->pathdata.Points[path->pathdata.Count++].Y = y + args->ascent - fromfixedpoint(curve->apfx[j].y) * args->scale;
} }
break; break;
case TT_PRIM_CSPLINE: case TT_PRIM_CSPLINE:
@ -917,7 +917,7 @@ static GpStatus format_string_callback(HDC dc,
{ {
path->pathdata.Types[path->pathdata.Count] = PathPointTypeBezier; path->pathdata.Types[path->pathdata.Count] = PathPointTypeBezier;
path->pathdata.Points[path->pathdata.Count].X = x + fromfixedpoint(curve->apfx[j].x) * args->scale; path->pathdata.Points[path->pathdata.Count].X = x + fromfixedpoint(curve->apfx[j].x) * args->scale;
path->pathdata.Points[path->pathdata.Count++].Y = y + bb_end - fromfixedpoint(curve->apfx[j].y) * args->scale; path->pathdata.Points[path->pathdata.Count++].Y = y + args->ascent - fromfixedpoint(curve->apfx[j].y) * args->scale;
} }
break; break;
default: default:
@ -992,6 +992,7 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT
args.path = path; args.path = path;
args.maxY = 0; args.maxY = 0;
args.scale = emSize / native_height; args.scale = emSize / native_height;
args.ascent = textmetric.tmAscent * args.scale;
status = gdip_format_string(dc, string, length, NULL, &scaled_layout_rect, format, format_string_callback, &args); status = gdip_format_string(dc, string, length, NULL, &scaled_layout_rect, format, format_string_callback, &args);
DeleteDC(dc); DeleteDC(dc);