[Controls] Fix wrong size of TSkLabel with AutoSize and Align=None #273

Co-Authored-By: Paulo César Botelho Barbosa <16469061+paulocesarbot@users.noreply.github.com>
skia4delphi · Oct 23, 2023 · cb00373 · cb00373
1 parent 628bf71
commit cb00373
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/Source/FMX/FMX.Skia.Canvas.pas b/Source/FMX/FMX.Skia.Canvas.pas
@@ -3262,11 +3262,13 @@ procedure TSkTextLayout.UpdateParagraph;
   end;
 
   procedure ParagraphLayout(const AParagraph: ISkParagraph; AMaxWidth: Single);
+  const
+    MaxLayoutWidth = High(Integer) - High(Word);
   begin
     if CompareValue(AMaxWidth, 0, TEpsilon.Position) = GreaterThanValue then
     begin
       // The SkParagraph.Layout calls a floor for the MaxWidth, so we should ceil it to force the original AMaxWidth
-      AParagraph.Layout(Ceil(AMaxWidth + TEpsilon.Matrix));
+      AParagraph.Layout(Min(Ceil(AMaxWidth + TEpsilon.Matrix), MaxLayoutWidth));
     end
     else
       AParagraph.Layout(0);

diff --git a/Source/FMX/FMX.Skia.pas b/Source/FMX/FMX.Skia.pas
@@ -5913,11 +5913,13 @@ procedure TSkLabel.ParagraphLayout(AMaxWidth: Single);
     AParagraph.Layout(Result);
   end;
 
+const
+  MaxLayoutWidth = High(Integer) - High(Word);
 var
   LMaxWidthUsed: Single;
   LParagraph: ISkParagraph;
 begin
-  AMaxWidth := Max(AMaxWidth, 0);
+  AMaxWidth := EnsureRange(AMaxWidth, 0, MaxLayoutWidth);
   if not SameValue(FParagraphLayoutWidth, AMaxWidth, TEpsilon.Position) then
   begin
     LParagraph := Paragraph;

diff --git a/Source/VCL/Vcl.Skia.pas b/Source/VCL/Vcl.Skia.pas
@@ -6069,11 +6069,13 @@ procedure TSkLabel.ParagraphLayout(AMaxWidth: Single);
     AParagraph.Layout(Result);
   end;
 
+const
+  MaxLayoutWidth = High(Integer) - High(Word);
 var
   LMaxWidthUsed: Single;
   LParagraph: ISkParagraph;
 begin
-  AMaxWidth := Max(AMaxWidth, 0);
+  AMaxWidth := EnsureRange(AMaxWidth, 0, MaxLayoutWidth);
   if not SameValue(FParagraphLayoutWidth, AMaxWidth, TEpsilon.Position) then
   begin
     LParagraph := Paragraph;