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

gdiplus: Add support for vertical string alignment to GdipDrawString.

This commit is contained in:
Stephan Rose 2009-06-04 18:51:07 -04:00 committed by Alexandre Julliard
parent f01bfea62e
commit eb3904d02b
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/gdiplus/graphics.c
View File

@ -2089,7 +2089,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string
POINT corners[4]; POINT corners[4];
WCHAR* stringdup; WCHAR* stringdup;
REAL angle, ang_cos, ang_sin, rel_width, rel_height; REAL angle, ang_cos, ang_sin, rel_width, rel_height;
INT sum = 0, height = 0, fit, fitcpy, save_state, i, j, lret, nwidth, INT sum = 0, height = 0, offsety = 0, fit, fitcpy, save_state, i, j, lret, nwidth,
nheight; nheight;
SIZE size; SIZE size;
RECT drawcoord; RECT drawcoord;
@ -2105,9 +2105,22 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string
return NotImplemented; return NotImplemented;
} }
if(format) if(format){
TRACE("may be ignoring some format flags: attr %x\n", format->attr); TRACE("may be ignoring some format flags: attr %x\n", format->attr);
/* Should be no need to explicitly test for StringAlignmentNear as
* that is default behavior if no alignment is passed. */
if(format->vertalign != StringAlignmentNear){
RectF bounds;
GdipMeasureString(graphics, string, length, font, rect, format, &bounds, 0, 0);
if(format->vertalign == StringAlignmentCenter)
offsety = (rect->Height - bounds.Height) / 2;
else if(format->vertalign == StringAlignmentFar)
offsety = (rect->Height - bounds.Height);
}
}
if(length == -1) length = lstrlenW(string); if(length == -1) length = lstrlenW(string);
stringdup = GdipAlloc(length * sizeof(WCHAR)); stringdup = GdipAlloc(length * sizeof(WCHAR));
@ -2118,9 +2131,9 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string
SetTextColor(graphics->hdc, brush->lb.lbColor); SetTextColor(graphics->hdc, brush->lb.lbColor);
rectcpy[3].X = rectcpy[0].X = rect->X; rectcpy[3].X = rectcpy[0].X = rect->X;
rectcpy[1].Y = rectcpy[0].Y = rect->Y; rectcpy[1].Y = rectcpy[0].Y = rect->Y + offsety;
rectcpy[2].X = rectcpy[1].X = rect->X + rect->Width; rectcpy[2].X = rectcpy[1].X = rect->X + rect->Width;
rectcpy[3].Y = rectcpy[2].Y = rect->Y + rect->Height; rectcpy[3].Y = rectcpy[2].Y = rect->Y + offsety + rect->Height;
transform_and_round_points(graphics, corners, rectcpy, 4); transform_and_round_points(graphics, corners, rectcpy, 4);
if (roundr(rect->Width) == 0) if (roundr(rect->Width) == 0)