paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-22 14:39:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

fpvectorial: Fixes issue introduced by last commit

Browse Source 
git-svn-id: trunk@51960 -
This commit is contained in:
sekelsenmat 2016-03-16 11:20:06 +00:00
parent d7aa15e3e2
commit 3afa6fb8de
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/fpvectorial/fpvectorial.pas
View File

@ -453,6 +453,7 @@ type
TvEntityFeatures = record TvEntityFeatures = record
DrawsUpwards: Boolean; // TvText, TvEmbeddedVectorialDoc, etc draws upwards, but in the future we might have entities drawing downwards DrawsUpwards: Boolean; // TvText, TvEmbeddedVectorialDoc, etc draws upwards, but in the future we might have entities drawing downwards
DrawsUpwardHeightAdjustment: Integer; // in Canvas pixels DrawsUpwardHeightAdjustment: Integer; // in Canvas pixels
DrawsUpwardHeightAdjustment_FirstLineExcluded: Integer; // in Canvas pixels
end; end;
{ Now all elements } { Now all elements }
@ -5566,11 +5567,15 @@ begin
Result.DrawsUpwardHeightAdjustment := 0; Result.DrawsUpwardHeightAdjustment := 0;
if Value.Count > 0 then if Value.Count > 0 then
begin begin
//ActualText := Value.Text;
//Value.Text := Value.Strings[0];
CalculateHeightInCanvas(ADest, lHeight_px); CalculateHeightInCanvas(ADest, lHeight_px);
Result.DrawsUpwardHeightAdjustment := lHeight_px; Result.DrawsUpwardHeightAdjustment := lHeight_px;
//Value.Text := ActualText;
ActualText := Value.Text;
if Value.Count > 0 then
Value.Delete(0);
CalculateHeightInCanvas(ADest, lHeight_px);
Result.DrawsUpwardHeightAdjustment_FirstLineExcluded := lHeight_px;
Value.Text := ActualText;
end; end;
Result.DrawsUpwards := True; Result.DrawsUpwards := True;
end; end;
@ -8065,7 +8070,7 @@ begin
lEntity := GetFirstEntity(); lEntity := GetFirstEntity();
while lEntity <> nil do while lEntity <> nil do
begin begin
lHeight_px := lEntity.GetEntityFeatures(ADest).DrawsUpwardHeightAdjustment; lHeight_px := lEntity.GetEntityFeatures(ADest).DrawsUpwardHeightAdjustment_FirstLineExcluded;
if lEntity is TvText then if lEntity is TvText then
begin begin