system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 12:19:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

gdiplus: GdipMeasureCharacterRanges shouldn't add margins to string bounds.

Browse source
This commit is contained in:
Dmitry Timoshkov 2013-03-15 13:37:53 +09:00 committed by Alexandre Julliard
parent 534410b832
commit db746fe897
2 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
dlls/gdiplus/graphics.c
View file

@ -4684,11 +4684,6 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics,
scaled_rect.Y = layoutRect->Y * args.rel_height;
scaled_rect.Width = layoutRect->Width * args.rel_width;
scaled_rect.Height = layoutRect->Height * args.rel_height;
if (scaled_rect.Width >= 0.5)
{
scaled_rect.Width -= margin_x * 2.0 * args.rel_width;
if (scaled_rect.Width < 0.5) return Ok; /* doesn't fit */
}
get_font_hfont(graphics, font, stringFormat, &gdifont, NULL);
oldfont = SelectObject(hdc, gdifont);

8
dlls/gdiplus/tests/graphics.c
View file

@ -4033,11 +4033,8 @@ todo_wine
set_rect_empty(&bounds);
status = GdipGetRegionBounds(region, graphics, &bounds);
expect(Ok, status);
todo_wine
expectf_(5.0 + margin_x, bounds.X, 1.0);
todo_wine
expectf(5.0, bounds.Y);
todo_wine
expectf_(width_1, bounds.Width, 1.0);
todo_wine
expectf_(height - margin_y, bounds.Height, 1.0);
@ -4071,13 +4068,9 @@ todo_wine
set_rect_empty(&bounds);
status = GdipGetRegionBounds(region, graphics, &bounds);
expect(Ok, status);
todo_wine
expectf_(5.0 + margin_x, bounds.X, 1.0);
todo_wine
expectf(5.0, bounds.Y);
todo_wine
expectf_(width_1, bounds.Width, 1.0);
todo_wine
expectf(height_rgn, bounds.Height);
set_rect_empty(&rect);
@ -4234,6 +4227,7 @@ todo_wine
set_rect_empty(&bounds);
status = GdipGetRegionBounds(region, graphics, &bounds);
expect(Ok, status);
todo_wine
expectf_(5.0 + width_rgn/2.0, bounds.X, 1.0);
todo_wine
expectf_(5.0 + height_rgn/2.0, bounds.Y, 1.0);