[SKIA] Don't skip setting SKCanvas.TotalMatrix when we aren't sure wh…

…at the current transform is due to Save/Restore calls (#15027)
AvaloniaUI · Apr 20, 2024 · f7987ba · f7987ba
1 parent 7909216
commit f7987ba
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
@@ -30,7 +30,7 @@ internal partial class DrawingContextImpl : IDrawingContextImpl,
         private readonly Matrix? _postTransform;
         private double _currentOpacity = 1.0f;
         private readonly bool _disableSubpixelTextRendering;
-        private Matrix _currentTransform;
+        private Matrix? _currentTransform;
         private bool _disposed;
         private GRContext? _grContext;
         public GRContext? GrContext => _grContext;
@@ -466,7 +466,7 @@ public void DrawRectangle(IBrush? brush, IPen? pen, RoundedRect rect, BoxShadows
                             Transform = oldTransform;
                         }
 
-                        Canvas.Restore();
+                        RestoreCanvas();
                     }
                 }
             }
@@ -509,7 +509,7 @@ public void DrawRectangle(IBrush? brush, IPen? pen, RoundedRect rect, BoxShadows
                         using (var outerRRect = new SKRoundRect(outerRect))
                             Canvas.DrawRoundRectDifference(outerRRect, shadowRect, shadow.Paint);
                         Transform = oldTransform;
-                        Canvas.Restore();
+                        RestoreCanvas();
                         SKRoundRectCache.Shared.Return(shadowRect);
                     }
                 }
@@ -672,11 +672,17 @@ public void PushClip(IPlatformRenderInterfaceRegion region)
             Canvas.ClipRegion(r);
         }
 
+        private void RestoreCanvas()
+        {
+            _currentTransform = null;
+            Canvas.Restore();
+        }
+
         /// <inheritdoc />
         public void PopClip()
         {
             CheckLease();
-            Canvas.Restore();
+            RestoreCanvas();
         }
 
         public void PushLayer(Rect bounds)
@@ -688,7 +694,7 @@ public void PushLayer(Rect bounds)
         public void PopLayer()
         {
             CheckLease();
-            Canvas.Restore();
+            RestoreCanvas();
         }
 
         /// <inheritdoc />
@@ -731,7 +737,7 @@ public void PopOpacity()
 
             if (useOpacitySaveLayer)
             {
-                Canvas.Restore();
+                RestoreCanvas();
             }
 
             _currentOpacity = _opacityStack.Pop();
@@ -796,7 +802,7 @@ public void PushGeometryClip(IGeometryImpl clip)
         public void PopGeometryClip()
         {
             CheckLease();
-            Canvas.Restore();
+            RestoreCanvas();
         }
 
         /// <inheritdoc />
@@ -829,15 +835,15 @@ public void PopOpacityMask()
             // Return the paint wrapper's paint less the reset since the paint is already reset in the Dispose method above.
             SKPaintCache.Shared.Return(paintWrapper.Paint);
 
-            Canvas.Restore();
+            RestoreCanvas();
 
-            Canvas.Restore();
+            RestoreCanvas();
         }
 
         /// <inheritdoc />
         public Matrix Transform
         {
-            get { return _currentTransform; }
+            get { return _currentTransform ??= Canvas.TotalMatrix.ToAvaloniaMatrix(); }
             set
             {
                 CheckLease();

diff --git a/src/Skia/Avalonia.Skia/SkiaSharpExtensions.cs b/src/Skia/Avalonia.Skia/SkiaSharpExtensions.cs
@@ -124,6 +124,11 @@ public static SKMatrix ToSKMatrix(this Matrix m)
             return sm;
         }
 
+        internal static Matrix ToAvaloniaMatrix(this SKMatrix m) => new(
+            m.ScaleX, m.SkewY, m.Persp0,
+            m.SkewX, m.ScaleY, m.Persp1,
+            m.TransX, m.TransY, m.Persp2);
+
         public static SKColor ToSKColor(this Color c)
         {
             return new SKColor(c.R, c.G, c.B, c.A);