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

fpvectorial-svg: Fixes multiline text (text4.svg for example) rendering in all coord-systems and fixes basic text positioning in top-left coords

Browse Source 
git-svn-id: trunk@52873 -
This commit is contained in:
sekelsenmat 2016-08-26 09:45:13 +00:00
parent 9cb3874ac0
commit eab5d9e32c
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
components/fpvectorial/fpvectorial.pas
View File

@ -1525,6 +1525,7 @@ type
procedure GetNaturalRenderPos(var APageHeight: Integer; out AMulY: Double); virtual; abstract;
procedure SetNaturalRenderPos(AUseTopLeftCoords: Boolean); virtual;
function HasNaturalRenderPos: Boolean;
function GetTopLeftCoords_Adjustment(): Double;
{ Debug methods }
procedure GenerateDebugTree(ADestRoutine: TvDebugAddItemProc; APageItem: Pointer); virtual; abstract;
@ -5733,7 +5734,7 @@ var
lLongestLine, lLineWidth, lFontSizePx, lFontDescenderPx: Integer;
lText: string;
lDescender: Integer;
phi: Double;
phi, lYAdj: Double;
{$ifdef USE_LCL_CANVAS}
ACanvas: TCanvas absolute ADest;
lTextSize: TSize;
@ -5793,9 +5794,10 @@ begin
// ...
// We need to keep the order of lines drawing correct regardless of
// the drawing direction
//lYAdj := FPage.GetTopLeftCoords_Adjustment();
lowerDimY := refPt.Y - (lTextSize.CY - lDescender); // lowerDim.Y := refPt.Y + lFontSizePx * (1 + LINE_SPACING) * Value.Count * AMulY
upperDimY := refPt.Y;
curDimY := IfThen(AMulY < 0, lowerDimY, upperDimY);
curDimY := lowerDimY;
// TvText supports multiple lines
for i := 0 to Value.Count - 1 do
@ -6348,10 +6350,7 @@ var
j: Integer;
phi, lYAdj: Double;
begin
if FPage.UseTopLeftCoordinates then
lYAdj := 1
else
lYAdj := -1;
lYAdj := FPage.GetTopLeftCoords_Adjustment();
if (RX > 0) and (RY > 0) then
begin
@ -8431,9 +8430,9 @@ begin
OldTextX := lText.X;
OldTextY := lText.Y;
CurX := CoordToCanvasX(lText.X + X + lCurWidth, ADestX, AMulX);
CurY := CoordToCanvasY(lText.Y + Y, ADestY, AMulY);
lText.X := 0;
lText.Y := 0;
CurY := CoordToCanvasY(lText.Y + Y, ADestY, AMulY);
if AMulY < 0 then CurY += lHeight_px; // to keep the position in case of inversed drawing
lText.Render_Use_NextText_X := not lFirstText;
if lText.Render_Use_NextText_X then
@ -8966,6 +8965,14 @@ begin
Result := FUseTopLeftCoordinates;
end;
function TvPage.GetTopLeftCoords_Adjustment: Double;
begin
if UseTopLeftCoordinates then
Result := 1
else
Result := -1;
end;
{ TvVectorialPage }