From 339b9ef4300d9c1e5a9d5fe4a290cca07e2e6cf8 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Wed, 1 Jan 2020 18:33:32 +0000 Subject: [PATCH] jvcllaz: Fix TJvMarkupLabel "hiding" pages in a PageControl. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7212 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../jvcllaz/run/JvJans/jvmarkuplabel.pas | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/components/jvcllaz/run/JvJans/jvmarkuplabel.pas b/components/jvcllaz/run/JvJans/jvmarkuplabel.pas index b9b7aec4c..6a266d3ca 100644 --- a/components/jvcllaz/run/JvJans/jvmarkuplabel.pas +++ b/components/jvcllaz/run/JvJans/jvmarkuplabel.pas @@ -45,7 +45,7 @@ type FMarginTop: Integer; FAlignment: TAlignment; FText: TCaption; - procedure Refresh; + procedure RefreshLabel; procedure ParseHTML(S: string); procedure RenderHTML; procedure HTMLClearBreaks; @@ -57,6 +57,7 @@ type // procedure DoReadBackColor(Reader: TReader); protected // procedure FontChanged; override; + procedure Loaded; override; procedure SetText(const Value: TCaption); procedure SetAutoSize(Value: Boolean); override; // procedure DefineProperties(Filer: TFiler); override; @@ -176,8 +177,11 @@ begin end; end; -procedure TJvMarkupLabel.Refresh; +procedure TJvMarkupLabel.RefreshLabel; begin + if csLoading in ComponentState then + exit; + ParseHTML(FText); HTMLElementDimensions; Invalidate; @@ -192,10 +196,16 @@ end; procedure TJvMarkupLabel.FontChanged; begin inherited FontChanged; - Refresh; + RefreshLabel; end; } +procedure TJvMarkupLabel.Loaded; +begin + inherited; + RefreshLabel; +end; + procedure TJvMarkupLabel.ParseHTML(S: string); var P: Integer; @@ -610,7 +620,7 @@ begin S := StringReplace(S, SLineBreak, ' ', [rfReplaceAll]); S := TrimRight(S); FText := S; - Refresh; + RefreshLabel; end; {function TJvMarkupLabel.GetBackColor: TColor;