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 small improvements

Browse Source 
git-svn-id: trunk@47852 -
This commit is contained in:
sekelsenmat 2015-02-17 00:14:33 +00:00
parent 66daecb69a
commit 0448b0c317
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/fpvectorial/fpvectorial.pas
View File

@ -1151,7 +1151,7 @@ type
constructor create(APage : TvPage); override;
destructor destroy; override;
function AddRow : TvTableRow;
function AddRow: TvTableRow;
function GetRowCount : Integer;
function GetRow(AIndex: Integer) : TvTableRow;
//
@ -1706,7 +1706,7 @@ begin
end;
CurRow.CalculateBoundingBox(ADest, lLeft, lTop, lRight, lBottom);
ColWidthsInMM[col] := lRight;
ColWidthsInMM[col] := Max(ColWidthsInMM[col], lRight);
TableWidth := TableWidth + ColWidthsInMM[col];
end;
end;
@ -1817,7 +1817,7 @@ begin
for row := 0 to GetRowCount()-1 do
begin
CurRow := GetRow(row);
CurRow.Render(ADest, ARenderInfo, ADestX, ADestY, AMulX, AMulY);
CurRow.Render(ADest, ARenderInfo, ADestX, CoordToCanvasY(CurHeight), AMulX, AMulY);
CurHeight := CurHeight + CurRow.Height;
end;
end;
@ -1831,6 +1831,12 @@ begin
FExtraDebugStr := Format(' Caption=%s', [Caption]);
Result := inherited GenerateDebugTree(ADestRoutine, APageItem);
// data which goes into a separate item
FExtraDebugStr := 'ColWidthsInMM=';
for i := 0 to Length(ColWidthsInMM)-1 do
FExtraDebugStr := FExtraDebugStr + Format('[%d]=%f ', [i, ColWidthsInMM[i]]);
ADestRoutine(FExtraDebugStr, Result);
// Add rows
for i := 0 to GetRowCount()-1 do
begin
@ -3664,7 +3670,7 @@ var
begin
lStr := Format('[%s] Name=%s X=%f Y=%f Text="%s" [.Font=>] Color=%s Size=%d Name=%s Orientation=%f Bold=%s Italic=%s Underline=%s StrikeThrough=%s TextAnchor=%s',
[
Self.ClassName, Name, X, Y, Value.Text,
Self.ClassName, Name, X, Y, Trim(Value.Text),
GenerateDebugStrForFPColor(Font.Color),
Font.Size, Font.Name, Font.Orientation,
BoolToStr(Font.Bold),