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

gdiplus: Measure the passed in string without height clipping in order to compute correct Y offset.

This commit is contained in:
Dmitry Timoshkov 2012-05-15 01:35:24 +09:00 committed by Alexandre Julliard
parent c436887483
commit bf9aed6f5c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/gdiplus/graphics.c
View File

@ -5161,14 +5161,18 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string
/* Should be no need to explicitly test for StringAlignmentNear as /* Should be no need to explicitly test for StringAlignmentNear as
* that is default behavior if no alignment is passed. */ * that is default behavior if no alignment is passed. */
if(format->vertalign != StringAlignmentNear){ if(format->vertalign != StringAlignmentNear){
RectF bounds; RectF bounds, in_rect = *rect;
GdipMeasureString(graphics, string, length, font, rect, format, &bounds, 0, 0); in_rect.Height = 0.0; /* avoid height clipping */
GdipMeasureString(graphics, string, length, font, &in_rect, format, &bounds, 0, 0);
TRACE("bounds %s\n", debugstr_rectf(&bounds));
if(format->vertalign == StringAlignmentCenter) if(format->vertalign == StringAlignmentCenter)
offsety = (rect->Height - bounds.Height) / 2; offsety = (rect->Height - bounds.Height) / 2;
else if(format->vertalign == StringAlignmentFar) else if(format->vertalign == StringAlignmentFar)
offsety = (rect->Height - bounds.Height); offsety = (rect->Height - bounds.Height);
} }
TRACE("vertical align %d, offsety %f\n", format->vertalign, offsety);
} }
save_state = SaveDC(hdc); save_state = SaveDC(hdc);