[FMX Render] Improve performance for FillRect with round corners

viniciusfbb · paulocesarbot · viniciusfbb · commit 2565b7b71a6d · 2024-10-22T21:59:51.000-03:00
Co-Authored-By: Paulo César Botelho Barbosa &lt;16469061+paulocesarbot@users.noreply.github.com&gt;
diff --git a/Source/FMX/FMX.Skia.Canvas.pas b/Source/FMX/FMX.Skia.Canvas.pas
@@ -115,6 +115,8 @@     TBrushData = record
     procedure DoFillEllipse(const ARect: TRectF; const AOpacity: Single; const ABrush: TBrush); override;
     procedure DoFillPath(const APath: TPathData; const AOpacity: Single; const ABrush: TBrush); override;
     procedure DoFillRect(const ARect: TRectF; const AOpacity: Single; const ABrush: TBrush); override;
+    procedure DoFillRoundRect(const ARect: TRectF; const XRadius, YRadius: Single; const ACorners: TCorners;
+      const AOpacity: Single; const ABrush: TBrush; const ACornerType: TCornerType); override;
     {$IF CompilerVersion >= 30}
     procedure DoSetMatrix(const AMatrix: TMatrix); override;
     {$ENDIF}
@@ -2096,6 +2098,41 @@ procedure TSkCanvasCustom.DoFillRect(const ARect: TRectF;
   end;
 end;
 
+procedure TSkCanvasCustom.DoFillRoundRect(const ARect: TRectF; const XRadius, YRadius: Single; const ACorners: TCorners;
+  const AOpacity: Single; const ABrush: TBrush; const ACornerType: TCornerType);
+var
+  LBrushData: TBrushData;
+  LPaint: TSkPaint;
+  LRoundRectRadii: TSkRoundRectRadii;
+begin
+  if ACornerType <> TCornerType.Round then
+    inherited
+  else
+  begin
+    LPaint := BeginPaintWithBrush(ABrush, ARect, AOpacity, LBrushData);
+    if LPaint <> nil then
+    try
+      if ACorners = AllCorners then
+        Canvas.DrawRoundRect(ARect, XRadius, YRadius, LPaint)
+      else
+      begin
+        FillChar(LRoundRectRadii, SizeOf(LRoundRectRadii), 0);
+        if TCorner.TopLeft in ACorners then
+          LRoundRectRadii[TSkRoundRectCorner.UpperLeft] := PointF(XRadius, YRadius);
+        if TCorner.TopRight in ACorners then
+          LRoundRectRadii[TSkRoundRectCorner.UpperRight] := PointF(XRadius, YRadius);
+        if TCorner.BottomLeft in ACorners then
+          LRoundRectRadii[TSkRoundRectCorner.LowerLeft] := PointF(XRadius, YRadius);
+        if TCorner.BottomRight in ACorners then
+          LRoundRectRadii[TSkRoundRectCorner.LowerRight] := PointF(XRadius, YRadius);
+        Canvas.DrawRoundRect(TSkRoundRect.Create(ARect, LRoundRectRadii), LPaint);
+      end;
+    finally
+      EndPaint(LBrushData);
+    end;
+  end;
+end;
+
 class procedure TSkCanvasCustom.DoFinalizeBitmap(var ABitmapHandle: THandle);
 begin
 end;
