pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

jvcllaz: Fix TJvMarkupLabel "hiding" pages in a PageControl.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7212 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2020-01-01 18:33:32 +00:00
parent 1c87132ba3
commit 339b9ef430
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
components/jvcllaz/run/JvJans/jvmarkuplabel.pas
View File

@ -45,7 +45,7 @@ type
FMarginTop: Integer; FMarginTop: Integer;
FAlignment: TAlignment; FAlignment: TAlignment;
FText: TCaption; FText: TCaption;
procedure Refresh; procedure RefreshLabel;
procedure ParseHTML(S: string); procedure ParseHTML(S: string);
procedure RenderHTML; procedure RenderHTML;
procedure HTMLClearBreaks; procedure HTMLClearBreaks;
@ -57,6 +57,7 @@ type
// procedure DoReadBackColor(Reader: TReader); // procedure DoReadBackColor(Reader: TReader);
protected protected
// procedure FontChanged; override; // procedure FontChanged; override;
procedure Loaded; override;
procedure SetText(const Value: TCaption); procedure SetText(const Value: TCaption);
procedure SetAutoSize(Value: Boolean); override; procedure SetAutoSize(Value: Boolean); override;
// procedure DefineProperties(Filer: TFiler); override; // procedure DefineProperties(Filer: TFiler); override;
@ -176,8 +177,11 @@ begin
end; end;
end; end;
procedure TJvMarkupLabel.Refresh; procedure TJvMarkupLabel.RefreshLabel;
begin begin
if csLoading in ComponentState then
exit;
ParseHTML(FText); ParseHTML(FText);
HTMLElementDimensions; HTMLElementDimensions;
Invalidate; Invalidate;
@ -192,10 +196,16 @@ end;
procedure TJvMarkupLabel.FontChanged; procedure TJvMarkupLabel.FontChanged;
begin begin
inherited FontChanged; inherited FontChanged;
Refresh; RefreshLabel;
end; end;
} }
procedure TJvMarkupLabel.Loaded;
begin
inherited;
RefreshLabel;
end;
procedure TJvMarkupLabel.ParseHTML(S: string); procedure TJvMarkupLabel.ParseHTML(S: string);
var var
P: Integer; P: Integer;
@ -610,7 +620,7 @@ begin
S := StringReplace(S, SLineBreak, ' ', [rfReplaceAll]); S := StringReplace(S, SLineBreak, ' ', [rfReplaceAll]);
S := TrimRight(S); S := TrimRight(S);
FText := S; FText := S;
Refresh; RefreshLabel;
end; end;
{function TJvMarkupLabel.GetBackColor: TColor; {function TJvMarkupLabel.GetBackColor: TColor;