paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2026-01-06 03:00:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

CairoCanvas, fix text alignment using xbearing, fix pangocairo text size and position, from Julio Jiménez Borreguero

Browse Source 
git-svn-id: trunk@40649 -
This commit is contained in:
jesus 2013-03-27 17:31:26 +00:00
parent 7898c68da5
commit 6528fabab6
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/cairocanvas/cairocanvas.pas
View File

@ -636,7 +636,7 @@ var
CurLine.EndL := 1;
s1 := Copy(s, CurLine.Start, CurLine.EndL-CurLine.Start+1);
cairo_text_extents(cr, PChar(s1), @te);
CurLine.Width := te.width;
CurLine.Width := te.width + te.x_bearing;
end;
if st > 0 then begin
CurLine := TLine.Create;
@ -730,7 +730,8 @@ begin
end else begin
SelectFont;
{$ifdef pangocairo}
theFOnt := format('%s %s %d',[Font.name, StylesToStr(Font.Style), Round(Font.Height*FontScale)]);
// use absolute font size sintax (px)
theFOnt := format('%s %s %dpx',[Font.name, StylesToStr(Font.Style), abs(Font.Size)]);
{$endif}
end;
cairo_font_extents(cr, @fe);
@ -813,7 +814,11 @@ 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);