paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-30 12:20:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Font properties properly editable (published)

Browse Source 
git-svn-id: trunk@38380 -
This commit is contained in:
michael 2018-02-28 14:29:43 +00:00
parent 84eb4c73e1
commit f4d3d6280c
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
packages/fcl-report/src/fpreport.pp
View File

@ -299,6 +299,7 @@ type
public
constructor Create; virtual;
procedure Assign(Source: TPersistent); override;
Published
property Name: string read FFontName write SetFontName;
{ value is in font Point units }
property Size: integer read FFontSize write SetFontSize default 10;
@ -2131,6 +2132,13 @@ function gBandFactory : TFPReportBandFactory;
Function ReportExportManager : TFPReportExportManager;
{ this should probably be more configurable or flexible per platform }
Const
cDefaultFont = 'Helvetica';
Var
ReportDefaultFont : string = cDefaultFont;
implementation
uses
@ -2142,8 +2150,6 @@ uses
fpTTF;
resourcestring
{ this should probably be more configurable or flexible per platform }
cDefaultFont = 'Helvetica';
cPageCountMarker = '~PC~';
SErrInvalidLineWidth = 'Invalid line width: %d';
@ -8978,7 +8984,7 @@ end;
constructor TFPReportFont.Create;
begin
inherited Create;
FFontName := cDefaultFont;
FFontName := ReportDefaultFont;
FFontColor := clBlack;
FFontSize := 10;
end;
@ -8987,13 +8993,15 @@ procedure TFPReportFont.Assign(Source: TPersistent);
var
o: TFPReportFont;
begin
//inherited Assign(Source);
if (Source = nil) or not (Source is TFPReportFont) then
ReportError(SErrCantAssignReportFont);
o := TFPReportFont(Source);
FFontName := o.Name;
FFontSize := o.Size;
FFontColor := o.Color;
if (Source is TFPReportFont) then
begin
o := TFPReportFont(Source);
FFontName := o.Name;
FFontSize := o.Size;
FFontColor := o.Color;
end
else
Inherited Assign(Source);
end;
{ TFPReportPaperManager }