|
@@ -64,15 +64,15 @@ type
|
|
class var FFresnelLabelTypeID: TCSSNumericalID;
|
|
class var FFresnelLabelTypeID: TCSSNumericalID;
|
|
class constructor InitFresnelLabelClass;
|
|
class constructor InitFresnelLabelClass;
|
|
private
|
|
private
|
|
- FCaption: String;
|
|
|
|
- FRenderedCaption: String;
|
|
|
|
|
|
+ FCaption: TFresnelCaption;
|
|
|
|
+ FRenderedCaption: TFresnelCaption;
|
|
protected
|
|
protected
|
|
FLabelStates: TFresnelLabelStates;
|
|
FLabelStates: TFresnelLabelStates;
|
|
FMinCaption: String; // Caption with linebreak after each word
|
|
FMinCaption: String; // Caption with linebreak after each word
|
|
FMinWidth: TFresnelLength; // width of longest word of Caption
|
|
FMinWidth: TFresnelLength; // width of longest word of Caption
|
|
FSize: TFresnelPoint; // width+height of Caption
|
|
FSize: TFresnelPoint; // width+height of Caption
|
|
procedure ComputeMinCaption; virtual;
|
|
procedure ComputeMinCaption; virtual;
|
|
- procedure SetCaption(const AValue: String); virtual;
|
|
|
|
|
|
+ procedure SetCaption(const AValue: TFresnelCaption); virtual;
|
|
procedure SetName(const NewName: TComponentName); override;
|
|
procedure SetName(const NewName: TComponentName); override;
|
|
procedure DoRender(aRenderer: IFresnelRenderer); override;
|
|
procedure DoRender(aRenderer: IFresnelRenderer); override;
|
|
public
|
|
public
|
|
@@ -85,8 +85,8 @@ type
|
|
procedure UpdateRenderedAttributes; override;
|
|
procedure UpdateRenderedAttributes; override;
|
|
class function CSSTypeID: TCSSNumericalID; override;
|
|
class function CSSTypeID: TCSSNumericalID; override;
|
|
class function CSSTypeName: TCSSString; override;
|
|
class function CSSTypeName: TCSSString; override;
|
|
- property Caption: String read FCaption write SetCaption;
|
|
|
|
- property RenderedCaption: String read FRenderedCaption write FRenderedCaption;
|
|
|
|
|
|
+ property Caption: TFresnelCaption read FCaption write SetCaption;
|
|
|
|
+ property RenderedCaption: TFresnelCaption read FRenderedCaption write FRenderedCaption;
|
|
end;
|
|
end;
|
|
|
|
|
|
{ TLabel }
|
|
{ TLabel }
|
|
@@ -489,7 +489,7 @@ begin
|
|
SetLength(FMinCaption,TargetP-1);
|
|
SetLength(FMinCaption,TargetP-1);
|
|
end;
|
|
end;
|
|
|
|
|
|
-procedure TCustomLabel.SetCaption(const AValue: String);
|
|
|
|
|
|
+procedure TCustomLabel.SetCaption(const AValue: TFresnelCaption);
|
|
begin
|
|
begin
|
|
if FCaption=AValue then Exit;
|
|
if FCaption=AValue then Exit;
|
|
FCaption:=AValue;
|
|
FCaption:=AValue;
|