paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-15 07:19:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

fpvectorial: minor improvements

Browse Source 
git-svn-id: trunk@40799 -
This commit is contained in:
sekelsenmat 2013-04-12 15:53:56 +00:00
parent 83c6aa7374
commit 140415c25d
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/fpvectorial/fpvectorial.pas
View File

@ -637,7 +637,7 @@ type
protected protected
FElements: TFPList; // of TvEntity FElements: TFPList; // of TvEntity
public public
SetPenBrushAndFontElements: TvSetPenBrushAndFontElements; SetPenBrushAndFontElements: TvSetPenBrushAndFontElements;// This is not currently implemented!
constructor Create; override; constructor Create; override;
destructor Destroy; override; destructor Destroy; override;
// //
@ -1827,7 +1827,16 @@ function TvText.GenerateDebugTree(ADestRoutine: TvDebugAddItemProc;
var var
lStr: string; lStr: string;
begin begin
lStr := Format('[%s] Name=%s X=%f Y=%f Text=%s', [Self.ClassName, Name, X, Y, Value.Text]); lStr := Format('[%s] Name=%s X=%f Y=%f Text="%s" Color=%s Size=%d Name=%s Orientation=%f Bold=%s Italic=%s Underline=%s StrikeThrough=%s',
[
Self.ClassName, Name, X, Y, Value.Text,
GenerateDebugStrForFPColor(Font.Color),
Font.Size, Font.Name, Font.Orientation,
BoolToStr(Font.Bold),
BoolToStr(Font.Italic),
BoolToStr(Font.Underline),
BoolToStr(Font.StrikeThrough)
]);
Result := ADestRoutine(lStr, APageItem); Result := ADestRoutine(lStr, APageItem);
end; end;

6
components/fpvectorial/svgvectorialreader.pas
View File

@ -773,6 +773,12 @@ begin
ADestEntity.Font.Color := ReadSVGColor(AValue); ADestEntity.Font.Color := ReadSVGColor(AValue);
Result := Result + [spbfFontColor]; Result := Result + [spbfFontColor];
end end
// But sometimes SVG also uses stroke! Oh no...
else if AKey = 'stroke' then
begin
ADestEntity.Font.Color := ReadSVGColor(AValue);
Result := Result + [spbfFontColor];
end
else if AKey = 'fill-opacity' then else if AKey = 'fill-opacity' then
ADestEntity.Font.Color.Alpha := StrToInt(AValue)*$101 ADestEntity.Font.Color.Alpha := StrToInt(AValue)*$101
else if AKey = 'font-size' then else if AKey = 'font-size' then