CairoCanvas, TextExtent patch from Julio Jiménez Borreguero

git-svn-id: trunk@40716 -
This commit is contained in:
jesus 2013-04-04 19:40:08 +00:00
parent 7c0279641e
commit 7e17e5a27a

View File

@ -901,14 +901,14 @@ begin
cairo_text_extents(cr, PChar(Text), @extents);
pango_layout_set_text(Layout, pchar(Text), -1);
pango_layout_get_extents(Layout, @theRect, nil);
Result.cx := Round((theRect.width/PANGO_SCALE-extents.x_bearing)/ScaleX);
Result.cy := Round((theRect.height/PANGO_SCALE-extents.y_bearing)/ScaleY);
Result.cx := Round((theRect.width/PANGO_SCALE)/ScaleX-extents.x_bearing);
Result.cy := Round((theRect.height/PANGO_SCALE)/ScaleY-extents.y_bearing);
g_object_unref(Layout);
pango_font_description_free(desc);
{$else}
cairo_text_extents(cr, PChar(Text), @extents); //transformation matrix is here ignored
Result.cx := Round((extents.width+extents.x_bearing)/ScaleX);
Result.cy := Round((extents.height+extents.y_bearing)/ScaleY);
Result.cx := Round((extents.width)/ScaleX+extents.x_bearing);
Result.cy := Round((extents.height)/ScaleY-extents.y_bearing);
{$endif}
end;