Apply alignment to bounding box in cairo_MeasureString.

Author: filipnavara

src/text-cairo.c

@@ -705,6 +705,40 @@ MeasureString (GpGraphics *graphics, GDIPCONST WCHAR *stringUnicode, int *length
 			boundingBox->Width = gdip_convgr_unitx (graphics, boundingBox->Width);
 			boundingBox->Height = gdip_convgr_unity (graphics, boundingBox->Height);
 		}
+
+		switch (AlignVert) {
+		case StringAlignmentCenter:
+			if (format->formatFlags & StringFormatFlagsDirectionVertical) {
+				boundingBox->X += (FrameHeight - MaxY) * 0.5;
+			} else {
+				boundingBox->Y += (FrameHeight - MaxY) * 0.5;
+			}
+			break;
+		case StringAlignmentFar:
+			if (format->formatFlags & StringFormatFlagsDirectionVertical) {
+				boundingBox->X += (FrameHeight - MaxY);
+			} else {
+				boundingBox->Y += (FrameHeight - MaxY);
+			}
+			break;
+		}
+
+		switch (AlignHorz) {
+		case StringAlignmentCenter:
+			if (format->formatFlags & StringFormatFlagsDirectionVertical) {
+				boundingBox->Y += (FrameWidth - MaxX) * 0.5;
+			} else {
+				boundingBox->X += (FrameWidth - MaxX) * 0.5;
+			}
+			break;
+		case StringAlignmentFar:
+			if (format->formatFlags & StringFormatFlagsDirectionVertical) {
+				boundingBox->Y += (FrameWidth - MaxX);
+			} else {
+				boundingBox->X += (FrameWidth - MaxX);
+			}
+			break;
+		}
 	}
 
 	if (codepointsFitted) {

tests/testtext.c

@@ -191,14 +191,12 @@ static void test_measure_string_alignment(void)
 		rect.Width = 200.0;
 		rect.Height = 100.0;
 		set_rect_empty (&bounds);
-#ifdef USE_PANGO_RENDERING
 		status = GdipMeasureString (graphics, teststring1, 1, font, &rect, format, &bounds, NULL, NULL);
 		expect (Ok, status);
 		expectf_ (td[i].x_x0 + td[i].x_xx * bounds.Width + 5.0, bounds.X, 0.6);
 		expectf_ (td[i].y_y0 + td[i].y_yy * bounds.Height + 10.0, bounds.Y, 0.6);
 		expectf_ (td[i].right_x0 + td[i].right_xx * bounds.Width + 5.0, bounds.X + bounds.Width, 0.6);
 		expectf_ (td[i].bottom_y0 + td[i].bottom_yy * bounds.Height + 10.0, bounds.Y + bounds.Height, 0.6);
-#endif
 
 		status = GdipMeasureCharacterRanges (graphics, teststring1, 1, font, &rect, format, 1, &region);
 		expect (Ok, status);