mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-14 12:00:02 +02:00
tuborpower ipro: added DefaultFontSize from Dieter
git-svn-id: trunk@14410 -
This commit is contained in:
parent
944b28741c
commit
753945f7af
@ -2197,6 +2197,7 @@ type
|
|||||||
StartPos : Integer;
|
StartPos : Integer;
|
||||||
FFixedTypeface: string; {!!.10}
|
FFixedTypeface: string; {!!.10}
|
||||||
FDefaultTypeFace: string;
|
FDefaultTypeFace: string;
|
||||||
|
FDefaultFontSize: integer;
|
||||||
ParmBuf: PChar; {!!.12}
|
ParmBuf: PChar; {!!.12}
|
||||||
ParmBufSize: Integer; {!!.12}
|
ParmBufSize: Integer; {!!.12}
|
||||||
procedure ResetCanvasData;
|
procedure ResetCanvasData;
|
||||||
@ -2449,6 +2450,7 @@ type
|
|||||||
property FlagErrors : Boolean read FFlagErrors write FFlagErrors;
|
property FlagErrors : Boolean read FFlagErrors write FFlagErrors;
|
||||||
property FixedTypeface: string read FFixedTypeface write FFixedTypeface;
|
property FixedTypeface: string read FFixedTypeface write FFixedTypeface;
|
||||||
property DefaultTypeFace: string read FDefaultTypeFace write FDefaultTypeFace;
|
property DefaultTypeFace: string read FDefaultTypeFace write FDefaultTypeFace;
|
||||||
|
property DefaultFontSize: integer read FDefaultFontSize write FDefaultFontSize;
|
||||||
property HtmlNode : TIpHtmlNodeHtml read FHtml;
|
property HtmlNode : TIpHtmlNodeHtml read FHtml;
|
||||||
procedure LoadFromStream(S : TStream);
|
procedure LoadFromStream(S : TStream);
|
||||||
procedure Render(TargetCanvas: TCanvas; TargetPageRect : TRect;
|
procedure Render(TargetCanvas: TCanvas; TargetPageRect : TRect;
|
||||||
@ -2760,6 +2762,7 @@ type
|
|||||||
FFlagErrors: Boolean;
|
FFlagErrors: Boolean;
|
||||||
FFixedTypeface: string; {!!.10}
|
FFixedTypeface: string; {!!.10}
|
||||||
FDefaultTypeFace: string;
|
FDefaultTypeFace: string;
|
||||||
|
FDefaultFontSize: integer;
|
||||||
FHotURL: string;
|
FHotURL: string;
|
||||||
FDataProvider: TIpAbstractHtmlDataProvider;
|
FDataProvider: TIpAbstractHtmlDataProvider;
|
||||||
URLStack : TStringList;
|
URLStack : TStringList;
|
||||||
@ -2805,6 +2808,7 @@ type
|
|||||||
function GetVersion : string;
|
function GetVersion : string;
|
||||||
procedure SetVersion(const Value : string);
|
procedure SetVersion(const Value : string);
|
||||||
procedure SetDefaultTypeFace(const Value: string);
|
procedure SetDefaultTypeFace(const Value: string);
|
||||||
|
procedure SetDefaultFontSize(const Value: integer);
|
||||||
public
|
public
|
||||||
function GetPrintPageCount: Integer;
|
function GetPrintPageCount: Integer;
|
||||||
constructor Create(AOwner: TComponent); override;
|
constructor Create(AOwner: TComponent); override;
|
||||||
@ -2854,6 +2858,8 @@ type
|
|||||||
read FFixedTypeface write FFixedTypeface; {!!.10}
|
read FFixedTypeface write FFixedTypeface; {!!.10}
|
||||||
property DefaultTypeFace: string
|
property DefaultTypeFace: string
|
||||||
read FDefaultTypeFace write SetDefaultTypeFace;
|
read FDefaultTypeFace write SetDefaultTypeFace;
|
||||||
|
property DefaultFontSize: integer
|
||||||
|
read FDefaultFontSize write SetDefaultFontSize;
|
||||||
property HotURL : string read FHotURL;
|
property HotURL : string read FHotURL;
|
||||||
property LinkColor : TColor
|
property LinkColor : TColor
|
||||||
read FLinkColor write FLinkColor default clBlue;
|
read FLinkColor write FLinkColor default clBlue;
|
||||||
@ -2905,6 +2911,7 @@ type
|
|||||||
property Enabled; {!!.10}
|
property Enabled; {!!.10}
|
||||||
property FixedTypeface; {!!.10}
|
property FixedTypeface; {!!.10}
|
||||||
property DefaultTypeFace;
|
property DefaultTypeFace;
|
||||||
|
property DefaultFontSize;
|
||||||
property FactBAParag; //JMN
|
property FactBAParag; //JMN
|
||||||
property FlagErrors;
|
property FlagErrors;
|
||||||
property LinkColor;
|
property LinkColor;
|
||||||
@ -8215,7 +8222,7 @@ begin
|
|||||||
{$ENDIF}
|
{$ENDIF}
|
||||||
end else
|
end else
|
||||||
Defaultprops.FontName := FDefaultTypeface;
|
Defaultprops.FontName := FDefaultTypeface;
|
||||||
Defaultprops.FontSize := 12;
|
Defaultprops.FontSize := FDefaultFontSize;
|
||||||
DefaultProps.BaseFontSize := 3;
|
DefaultProps.BaseFontSize := 3;
|
||||||
Defaultprops.FontBaseline := 0;
|
Defaultprops.FontBaseline := 0;
|
||||||
DefaultProps.VAlignment := hva3Baseline;
|
DefaultProps.VAlignment := hva3Baseline;
|
||||||
@ -17006,6 +17013,7 @@ begin
|
|||||||
Html := TIpHtml.Create;
|
Html := TIpHtml.Create;
|
||||||
Html.FixedTypeface := Viewer.FixedTypeface; {!!.10}
|
Html.FixedTypeface := Viewer.FixedTypeface; {!!.10}
|
||||||
Html.DefaultTypeFace := Viewer.DefaultTypeFace;
|
Html.DefaultTypeFace := Viewer.DefaultTypeFace;
|
||||||
|
Html.DefaultFontSize := Viewer.DefaultFontSize;
|
||||||
FFlagErrors := FlagErrors;
|
FFlagErrors := FlagErrors;
|
||||||
FMarginWidth := MarginWidth;
|
FMarginWidth := MarginWidth;
|
||||||
FMarginheight := MarginHeight;
|
FMarginheight := MarginHeight;
|
||||||
@ -18051,6 +18059,7 @@ begin
|
|||||||
FAllowTextSelect := True;
|
FAllowTextSelect := True;
|
||||||
FixedTypeface := 'Courier New'; {!!.10}
|
FixedTypeface := 'Courier New'; {!!.10}
|
||||||
DefaultTypeFace := Graphics.DefFontData.Name;
|
DefaultTypeFace := Graphics.DefFontData.Name;
|
||||||
|
DefaultFontSize := 12;
|
||||||
FPrintSettings := TIpHtmlPrintSettings.Create; {!!.10}
|
FPrintSettings := TIpHtmlPrintSettings.Create; {!!.10}
|
||||||
FFactBAParag := 1;
|
FFactBAParag := 1;
|
||||||
end;
|
end;
|
||||||
@ -18350,6 +18359,7 @@ begin
|
|||||||
NewHtml.BgColor := BgColor; //JMN
|
NewHtml.BgColor := BgColor; //JMN
|
||||||
NewHtml.FixedTypeface := FixedTypeface; {!!.10}
|
NewHtml.FixedTypeface := FixedTypeface; {!!.10}
|
||||||
NewHtml.DefaultTypeFace := DefaultTypeFace;
|
NewHtml.DefaultTypeFace := DefaultTypeFace;
|
||||||
|
NewHtml.DefaultFontSize := FDefaultFontSize;
|
||||||
MasterFrame.SetHtml(NewHtml);
|
MasterFrame.SetHtml(NewHtml);
|
||||||
end;
|
end;
|
||||||
{ LazDebug
|
{ LazDebug
|
||||||
@ -18499,6 +18509,17 @@ begin
|
|||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
procedure TIpHtmlCustomPanel.SetDefaultFontSize(const Value: integer);
|
||||||
|
begin
|
||||||
|
if FDefaultFontSize<>Value then begin
|
||||||
|
FDefaultFontSize := Value;
|
||||||
|
if (MasterFrame<>nil)and(MasterFrame.Html<>nil) then begin
|
||||||
|
MasterFrame.Html.DefaultFontSize := FDefaultFontSize;
|
||||||
|
Invalidate;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
|
||||||
procedure TIpHtmlCustomPanel.SetFactBAParag(const Value: Real); //JMN
|
procedure TIpHtmlCustomPanel.SetFactBAParag(const Value: Real); //JMN
|
||||||
var
|
var
|
||||||
V: Real;
|
V: Real;
|
||||||
|
Loading…
Reference in New Issue
Block a user