paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-19 19:29:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

CairoCanvas, Get the same text origin as cairo_show_text, (baseline left, instead of Pango's top left), from Julio Jiménez Borreguero

Browse Source 
git-svn-id: trunk@40661 -
This commit is contained in:
jesus 2013-03-28 17:57:15 +00:00
parent dd4612a337
commit af138e87a7
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/cairocanvas/cairocanvas.pas
View File

@ -814,11 +814,7 @@ begin
taCenter: x := BoxLeft + BoxWidth/2 - CurLine.Width/2;
taRightJustify: x := BoxLeft+BoxWidth - CurLine.Width;
end;
{$ifdef pangocairo}
cairo_move_to(cr, x, y);
{$else}
cairo_move_to(cr, x, y+fe.ascent);
{$endif}
s1 := Copy(s, CurLine.Start, CurLine.EndL-CurLine.Start+1);
{$ifdef pangocairo}
pango_layout_set_text(layout, pchar(s1), -1);
@ -828,10 +824,11 @@ begin
y := y + fe.height;
end;
{$ifdef pangocairo}
pango_font_description_free(desc);
pango_cairo_update_layout(cr, layout);
pango_cairo_show_layout(cr, layout);
// get the same text origin as cairo_show_text (baseline left, instead of Pango's top left)
pango_cairo_show_layout_line (cr, pango_layout_get_line (layout, 0));
g_object_unref(layout);
pango_font_description_free(desc);
{$endif}
finally