Add initial tests for GdipMeasureString and fix Pango text backend to pass them #268
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hughbe
reviewed
Mar 31, 2018
tests/testtext.c
Outdated
| set_rect_empty (&bounds); | ||
| status = GdipMeasureString (graphics, teststring1, 4, font, &rect, format, &bounds, &glyphs, &lines); | ||
| expect (Ok, status); | ||
| TODO expect (4, glyphs); |
There was a problem hiding this comment.
Do we still need these todos?
There was a problem hiding this comment.
(I’m assuming that these are for wine instead of for libgdiplus)
Maybe we can also use the #if USE_WINDOWS_GDIPLUS macro to be clearer about this
There was a problem hiding this comment.
These test are not from Wine (unlike the other PR). Yes, we need them, unfortunately.
There was a problem hiding this comment.
I can wrap the TODO macro with #if USE_WINDOWS_GDIPLUS. I'd prefer that over having #if all over the place.
…s for calculating codepointsFitted in pango_MeasureString.
filipnavara
changed the title
|
@monojenkins build |
akoeplinger
requested changes
Mar 31, 2018
src/text-pango.c
Outdated
| @@ -481,25 +486,25 @@ gdip_pango_setup_layout (GpGraphics *graphics, GDIPCONST WCHAR *stringUnicode, i | |||
| case StringAlignmentNear: | |||
| break; | |||
| case StringAlignmentCenter: | |||
| box_offset->Y += (rc->Height - box->Height) / 2; | |||
| box_offset->Y += (FrameHeight - box->Height) * .5; | |||
tests/testtext.c
Outdated
| { 0, StringAlignmentFar, StringAlignmentCenter, -1., 200, -.5, 50, 0, 200, .5, 50 }, | ||
| { 0, StringAlignmentNear, StringAlignmentFar, 0, 0, -1., 100, 1., 0, 0, 100 }, | ||
| { 0, StringAlignmentCenter, StringAlignmentFar, -.5, 100, -1., 100, .5, 100, 0, 100 }, | ||
| { 0, StringAlignmentFar, StringAlignmentFar, -1., 200, -1., 100, 0, 200, 0, 100 }, |
tests/testtext.c
Outdated
| expectf_ (td[i].x_x0 + td[i].x_xx * bounds.Width + 5., bounds.X, 0.6); | ||
| expectf_ (td[i].y_y0 + td[i].y_yy * bounds.Height + 10., bounds.Y, 0.6); | ||
| expectf_ (td[i].right_x0 + td[i].right_xx * bounds.Width + 5., bounds.X + bounds.Width, 0.6); | ||
| expectf_ (td[i].bottom_y0 + td[i].bottom_yy * bounds.Height + 10., bounds.Y + bounds.Height, 0.6); |
akoeplinger
approved these changes
Mar 31, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Unfortunately the Cairo text backend is too broken for the tests to be enabled there, so I initially enable them only when Pango text backend is used. Even now some of the tests are disabled because of small issues in the Pango code.