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

gdiplus: Implement horizontal alignment in GdipDrawString.

Browse Source
This commit is contained in:
Vincent Povirk 2009-06-29 16:36:11 -05:00 committed by Alexandre Julliard
parent 3ca49a10d8
commit aa9602db10
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dlls/gdiplus/graphics.c
View File

@ -2098,6 +2098,8 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string
INT sum = 0, height = 0, offsety = 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;
POINT drawbase;
UINT drawflags;
RECT drawcoord; RECT drawcoord;
TRACE("(%p, %s, %i, %p, %s, %p, %p)\n", graphics, debugstr_wn(string, length), TRACE("(%p, %s, %i, %p, %s, %p, %p)\n", graphics, debugstr_wn(string, length),
@ -2207,17 +2209,35 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string
length = j; length = j;
if (format->align == StringAlignmentNear)
{
drawbase.x = corners[0].x;
drawbase.y = corners[0].y;
drawflags = DT_NOCLIP | DT_EXPANDTABS;
}
else if (format->align == StringAlignmentCenter)
{
drawbase.x = (corners[0].x + corners[1].x)/2;
drawbase.y = (corners[0].y + corners[1].y)/2;
drawflags = DT_NOCLIP | DT_EXPANDTABS | DT_CENTER;
}
else /* (format->align == StringAlignmentFar) */
{
drawbase.x = corners[1].x;
drawbase.y = corners[1].y;
drawflags = DT_NOCLIP | DT_EXPANDTABS | DT_RIGHT;
}
while(sum < length){ while(sum < length){
drawcoord.left = corners[0].x + roundr(ang_sin * (REAL) height); drawcoord.left = drawcoord.right = drawbase.x + roundr(ang_sin * (REAL) height);
drawcoord.top = corners[0].y + roundr(ang_cos * (REAL) height); drawcoord.top = drawcoord.bottom = drawbase.y + roundr(ang_cos * (REAL) height);
GetTextExtentExPointW(graphics->hdc, stringdup + sum, length - sum, GetTextExtentExPointW(graphics->hdc, stringdup + sum, length - sum,
nwidth, &fit, NULL, &size); nwidth, &fit, NULL, &size);
fitcpy = fit; fitcpy = fit;
if(fit == 0){ if(fit == 0){
DrawTextW(graphics->hdc, stringdup + sum, 1, &drawcoord, DT_NOCLIP | DrawTextW(graphics->hdc, stringdup + sum, 1, &drawcoord, drawflags);
DT_EXPANDTABS);
break; break;
} }
@ -2246,7 +2266,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string
} }
} }
DrawTextW(graphics->hdc, stringdup + sum, min(length - sum, fit), DrawTextW(graphics->hdc, stringdup + sum, min(length - sum, fit),
&drawcoord, DT_NOCLIP | DT_EXPANDTABS); &drawcoord, drawflags);
sum += fit + (lret < fitcpy ? 1 : 0); sum += fit + (lret < fitcpy ? 1 : 0);
height += size.cy; height += size.cy;