From 99abea5f5565b08b5f2f9d27529469a259eb143a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?=
 <wieslawsoltes@users.noreply.github.com>
Date: Tue, 15 Jul 2025 10:26:45 +0200
Subject: [PATCH 01/10] Add wireframe mode

---
 samples/TestApp/Views/MainView.axaml  |  4 +++
 src/Svg.Controls.Skia.Avalonia/Svg.cs | 39 +++++++++++++++++++++++++++
 src/Svg.Skia/SKSvg.Model.cs           | 11 +++++++-
 src/Svg.Skia/SkiaModel.cs             | 38 ++++++++++++++++++++++++++
 4 files changed, 91 insertions(+), 1 deletion(-)

diff --git a/samples/TestApp/Views/MainView.axaml b/samples/TestApp/Views/MainView.axaml
index e43c992f84..7d8451e315 100644
--- a/samples/TestApp/Views/MainView.axaml
+++ b/samples/TestApp/Views/MainView.axaml
@@ -143,6 +143,10 @@
                       OffContent="Hide Bounds"
                       Margin="6,0,6,0"
                       Click="ShowHitBoundsToggle_OnToggled" />
+        <ToggleSwitch IsChecked="{Binding #Svg.Wireframe}"
+                      OnContent="Wireframe On"
+                      OffContent="Wireframe Off"
+                      Margin="6,0,6,0" />
         <Button Content="Export"
                 Command="{Binding ExportCommand}"
                 CommandParameter="{Binding #Svg}"
diff --git a/src/Svg.Controls.Skia.Avalonia/Svg.cs b/src/Svg.Controls.Skia.Avalonia/Svg.cs
index a50502dad5..de2c3efcfd 100644
--- a/src/Svg.Controls.Skia.Avalonia/Svg.cs
+++ b/src/Svg.Controls.Skia.Avalonia/Svg.cs
@@ -24,6 +24,7 @@ public class Svg : Control
     private readonly Uri _baseUri;
     private SvgSource? _svg;
     private bool _enableCache;
+    private bool _wireframe;
     private Dictionary<string, SvgSource>? _cache;
 
     /// <summary>
@@ -60,6 +61,14 @@ public class Svg : Control
             o => o.EnableCache,
             (o, v) => o.EnableCache = v);
 
+    /// <summary>
+    /// Defines the <see cref="Wireframe"/> property.
+    /// </summary>
+    public static readonly DirectProperty<Svg, bool> WireframeProperty =
+        AvaloniaProperty.RegisterDirect<Svg, bool>(nameof(Wireframe),
+            o => o.Wireframe,
+            (o, v) => o.Wireframe = v);
+
     /// <summary>
     /// Defines the Css property.
     /// </summary>
@@ -118,6 +127,15 @@ public bool EnableCache
         set { SetAndRaise(EnableCacheProperty, ref _enableCache, value); }
     }
 
+    /// <summary>
+    /// Gets or sets a value controlling wireframe rendering mode.
+    /// </summary>
+    public bool Wireframe
+    {
+        get { return _wireframe; }
+        set { SetAndRaise(WireframeProperty, ref _wireframe, value); }
+    }
+
     /// <summary>
     /// Gets svg picture.
     /// </summary>
@@ -374,6 +392,15 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
                 _cache = new Dictionary<string, SvgSource>();
             }
         }
+
+        if (change.Property == WireframeProperty)
+        {
+            if (_svg?.Svg is { } skSvg)
+            {
+                skSvg.Wireframe = change.GetNewValue<bool>();
+            }
+            InvalidateVisual();
+        }
     }
 
     private void LoadFromPath(string? path, SvgParameters? parameters = null)
@@ -389,6 +416,10 @@ private void LoadFromPath(string? path, SvgParameters? parameters = null)
         if (_enableCache && _cache is { } && _cache.TryGetValue(path, out var svg))
         {
             _svg = svg;
+            if (_svg.Svg is { } skSvg)
+            {
+                skSvg.Wireframe = _wireframe;
+            }
             return;
         }
 
@@ -401,6 +432,10 @@ private void LoadFromPath(string? path, SvgParameters? parameters = null)
         try
         {
             _svg = SvgSource.Load(path, _baseUri, parameters);
+            if (_svg?.Svg is { } skSvg2)
+            {
+                skSvg2.Wireframe = _wireframe;
+            }
 
             if (_enableCache && _cache is { } && _svg is { })
             {
@@ -429,6 +464,10 @@ private void LoadFromSource(string? source, SvgParameters? parameters = null)
             var bytes = Encoding.UTF8.GetBytes(source);
             using var ms = new MemoryStream(bytes);
             _svg = SvgSource.LoadFromStream(ms, parameters);
+            if (_svg?.Svg is { } skSvg)
+            {
+                skSvg.Wireframe = _wireframe;
+            }
         }
         catch (Exception e)
         {
diff --git a/src/Svg.Skia/SKSvg.Model.cs b/src/Svg.Skia/SKSvg.Model.cs
index cd0e98e92b..623ae25ecd 100644
--- a/src/Svg.Skia/SKSvg.Model.cs
+++ b/src/Svg.Skia/SKSvg.Model.cs
@@ -102,6 +102,8 @@ public static void Draw(SkiaSharp.SKCanvas skCanvas, string path, SkiaModel skia
 
     public virtual SkiaSharp.SKPicture? Picture { get; protected set; }
 
+    public bool Wireframe { get; set; }
+
     public event EventHandler<SKSvgDrawEventArgs>? OnDraw;
 
     protected virtual void RaiseOnDraw(SKSvgDrawEventArgs e)
@@ -270,7 +272,14 @@ public void Draw(SkiaSharp.SKCanvas canvas)
         }
 
         canvas.Save();
-        canvas.DrawPicture(picture);
+        if (Wireframe && Model is { })
+        {
+            SkiaModel.DrawWireframe(Model, canvas);
+        }
+        else
+        {
+            canvas.DrawPicture(picture);
+        }
         canvas.Restore();
 
         RaiseOnDraw(new SKSvgDrawEventArgs(canvas));
diff --git a/src/Svg.Skia/SkiaModel.cs b/src/Svg.Skia/SkiaModel.cs
index bb1c704ef5..bf2653b99d 100644
--- a/src/Svg.Skia/SkiaModel.cs
+++ b/src/Svg.Skia/SkiaModel.cs
@@ -1373,4 +1373,42 @@ public void Draw(SKPicture picture, SkiaSharp.SKCanvas skCanvas)
             Draw(canvasCommand, skCanvas);
         }
     }
+
+    public void DrawWireframe(SKPicture picture, SkiaSharp.SKCanvas skCanvas)
+    {
+        if (picture.Commands is null)
+        {
+            return;
+        }
+
+        using var paint = new SkiaSharp.SKPaint
+        {
+            IsAntialias = true,
+            Style = SkiaSharp.SKPaintStyle.Stroke,
+            Color = SkiaSharp.SKColors.Red,
+            StrokeWidth = 1
+        };
+
+        foreach (var canvasCommand in picture.Commands)
+        {
+            switch (canvasCommand)
+            {
+                case DrawPathCanvasCommand drawPathCanvasCommand when drawPathCanvasCommand.Path is { }:
+                {
+                    var path = ToSKPath(drawPathCanvasCommand.Path);
+                    skCanvas.DrawPath(path, paint);
+                    break;
+                }
+                case DrawImageCanvasCommand drawImageCanvasCommand:
+                {
+                    var dest = ToSKRect(drawImageCanvasCommand.Dest);
+                    skCanvas.DrawRect(dest, paint);
+                    break;
+                }
+                default:
+                    Draw(canvasCommand, skCanvas);
+                    break;
+            }
+        }
+    }
 }

From 78ad04e286adcea5024aa5652ae97691733c4f61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?=
 <wieslawsoltes@users.noreply.github.com>
Date: Tue, 15 Jul 2025 10:36:46 +0200
Subject: [PATCH 02/10] Improve wireframe rendering

---
 src/Svg.Skia/SkiaModel.cs | 79 ++++++++++++++++++++++++++++-----------
 1 file changed, 58 insertions(+), 21 deletions(-)

diff --git a/src/Svg.Skia/SkiaModel.cs b/src/Svg.Skia/SkiaModel.cs
index bf2653b99d..f552a1ab87 100644
--- a/src/Svg.Skia/SkiaModel.cs
+++ b/src/Svg.Skia/SkiaModel.cs
@@ -1374,41 +1374,78 @@ public void Draw(SKPicture picture, SkiaSharp.SKCanvas skCanvas)
         }
     }
 
-    public void DrawWireframe(SKPicture picture, SkiaSharp.SKCanvas skCanvas)
+    private SKPaint ToWireframePaint(SKPaint? paint)
     {
-        if (picture.Commands is null)
+        var result = paint?.Clone() ?? new SKPaint();
+        result.Style = SKPaintStyle.Stroke;
+        result.Color = new SKColor(0x80, 0x80, 0x80);
+        if (result.StrokeWidth == 0)
         {
-            return;
+            result.StrokeWidth = 1;
         }
+        return result;
+    }
 
-        using var paint = new SkiaSharp.SKPaint
+    private SKPicture ToWireframePicture(SKPicture picture)
+    {
+        if (picture.Commands is null)
         {
-            IsAntialias = true,
-            Style = SkiaSharp.SKPaintStyle.Stroke,
-            Color = SkiaSharp.SKColors.Red,
-            StrokeWidth = 1
-        };
+            return new SKPicture(picture.CullRect, null);
+        }
 
-        foreach (var canvasCommand in picture.Commands)
+        var recorder = new SKPictureRecorder();
+        var canvas = recorder.BeginRecording(picture.CullRect);
+
+        foreach (var cmd in picture.Commands)
         {
-            switch (canvasCommand)
+            switch (cmd)
             {
-                case DrawPathCanvasCommand drawPathCanvasCommand when drawPathCanvasCommand.Path is { }:
-                {
-                    var path = ToSKPath(drawPathCanvasCommand.Path);
-                    skCanvas.DrawPath(path, paint);
+                case ClipPathCanvasCommand clipPath:
+                    canvas.ClipPath(clipPath.ClipPath!, clipPath.Operation, clipPath.Antialias);
                     break;
-                }
-                case DrawImageCanvasCommand drawImageCanvasCommand:
+                case ClipRectCanvasCommand clipRect:
+                    canvas.ClipRect(clipRect.Rect, clipRect.Operation, clipRect.Antialias);
+                    break;
+                case SaveCanvasCommand:
+                    canvas.Save();
+                    break;
+                case RestoreCanvasCommand:
+                    canvas.Restore();
+                    break;
+                case SetMatrixCanvasCommand setMatrix:
+                    canvas.SetMatrix(setMatrix.DeltaMatrix);
+                    break;
+                case SaveLayerCanvasCommand saveLayer:
+                    canvas.SaveLayer(ToWireframePaint(saveLayer.Paint));
+                    break;
+                case DrawPathCanvasCommand drawPath when drawPath.Path is { }:
+                    canvas.DrawPath(drawPath.Path, ToWireframePaint(drawPath.Paint));
+                    break;
+                case DrawImageCanvasCommand drawImage:
                 {
-                    var dest = ToSKRect(drawImageCanvasCommand.Dest);
-                    skCanvas.DrawRect(dest, paint);
+                    var rectPath = new SKPath();
+                    rectPath.AddRect(drawImage.Dest);
+                    canvas.DrawPath(rectPath, ToWireframePaint(null));
                     break;
                 }
-                default:
-                    Draw(canvasCommand, skCanvas);
+                case DrawTextBlobCanvasCommand drawBlob when drawBlob.Paint is { }:
+                    canvas.DrawTextBlob(drawBlob.TextBlob!, drawBlob.X, drawBlob.Y, ToWireframePaint(drawBlob.Paint));
+                    break;
+                case DrawTextCanvasCommand drawText when drawText.Paint is { }:
+                    canvas.DrawText(drawText.Text, drawText.X, drawText.Y, ToWireframePaint(drawText.Paint));
+                    break;
+                case DrawTextOnPathCanvasCommand drawTextOnPath when drawTextOnPath.Paint is { } && drawTextOnPath.Path is { }:
+                    canvas.DrawTextOnPath(drawTextOnPath.Text, drawTextOnPath.Path, drawTextOnPath.HOffset, drawTextOnPath.VOffset, ToWireframePaint(drawTextOnPath.Paint));
                     break;
             }
         }
+
+        return recorder.EndRecording();
+    }
+
+    public void DrawWireframe(SKPicture picture, SkiaSharp.SKCanvas skCanvas)
+    {
+        var wfPicture = ToWireframePicture(picture);
+        Draw(wfPicture, skCanvas);
     }
 }

From bc9317254122b803a757fe02f0d72e6e6b7f5cf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?=
 <wieslawsoltes@users.noreply.github.com>
Date: Tue, 15 Jul 2025 11:10:37 +0200
Subject: [PATCH 03/10] Fix wireframe compile errors

---
 src/Svg.Skia/SkiaModel.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Svg.Skia/SkiaModel.cs b/src/Svg.Skia/SkiaModel.cs
index f552a1ab87..02ed6a3ce6 100644
--- a/src/Svg.Skia/SkiaModel.cs
+++ b/src/Svg.Skia/SkiaModel.cs
@@ -1378,7 +1378,7 @@ private SKPaint ToWireframePaint(SKPaint? paint)
     {
         var result = paint?.Clone() ?? new SKPaint();
         result.Style = SKPaintStyle.Stroke;
-        result.Color = new SKColor(0x80, 0x80, 0x80);
+        result.Color = SKColors.Gray;
         if (result.StrokeWidth == 0)
         {
             result.StrokeWidth = 1;
@@ -1429,7 +1429,7 @@ private SKPicture ToWireframePicture(SKPicture picture)
                     break;
                 }
                 case DrawTextBlobCanvasCommand drawBlob when drawBlob.Paint is { }:
-                    canvas.DrawTextBlob(drawBlob.TextBlob!, drawBlob.X, drawBlob.Y, ToWireframePaint(drawBlob.Paint));
+                    canvas.DrawText(drawBlob.TextBlob!, drawBlob.X, drawBlob.Y, ToWireframePaint(drawBlob.Paint));
                     break;
                 case DrawTextCanvasCommand drawText when drawText.Paint is { }:
                     canvas.DrawText(drawText.Text, drawText.X, drawText.Y, ToWireframePaint(drawText.Paint));

From 1ac92aa4810b0ffd1526bc1f74bfc866b754697c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?=
 <wieslawsoltes@users.noreply.github.com>
Date: Tue, 15 Jul 2025 11:39:37 +0200
Subject: [PATCH 04/10] Fix wireframe color

---
 src/Svg.Skia/SkiaModel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Svg.Skia/SkiaModel.cs b/src/Svg.Skia/SkiaModel.cs
index 02ed6a3ce6..37b806ffd6 100644
--- a/src/Svg.Skia/SkiaModel.cs
+++ b/src/Svg.Skia/SkiaModel.cs
@@ -1378,7 +1378,7 @@ private SKPaint ToWireframePaint(SKPaint? paint)
     {
         var result = paint?.Clone() ?? new SKPaint();
         result.Style = SKPaintStyle.Stroke;
-        result.Color = SKColors.Gray;
+        result.Color = new SKColor(128, 128, 128, 255);
         if (result.StrokeWidth == 0)
         {
             result.StrokeWidth = 1;

From 117d8fe343ede3a31f36625aede82734581fc69a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?=
 <wieslawsoltes@users.noreply.github.com>
Date: Tue, 15 Jul 2025 12:29:14 +0200
Subject: [PATCH 05/10] Improve wireframe rendering

---
 src/Svg.Skia/SKSvg.Model.cs |   2 +-
 src/Svg.Skia/SkiaModel.cs   | 120 +++++++++++++-----------------------
 2 files changed, 43 insertions(+), 79 deletions(-)

diff --git a/src/Svg.Skia/SKSvg.Model.cs b/src/Svg.Skia/SKSvg.Model.cs
index 623ae25ecd..2b2f3c0cc2 100644
--- a/src/Svg.Skia/SKSvg.Model.cs
+++ b/src/Svg.Skia/SKSvg.Model.cs
@@ -274,7 +274,7 @@ public void Draw(SkiaSharp.SKCanvas canvas)
         canvas.Save();
         if (Wireframe && Model is { })
         {
-            SkiaModel.DrawWireframe(Model, canvas);
+            SkiaModel.Draw(Model, canvas, true);
         }
         else
         {
diff --git a/src/Svg.Skia/SkiaModel.cs b/src/Svg.Skia/SkiaModel.cs
index 37b806ffd6..a59202edf3 100644
--- a/src/Svg.Skia/SkiaModel.cs
+++ b/src/Svg.Skia/SkiaModel.cs
@@ -1246,7 +1246,7 @@ public SKPath FromSKPath(SkiaSharp.SKPath skPath)
         return skPictureRecorder.EndRecording();
     }
 
-    public void Draw(CanvasCommand canvasCommand, SkiaSharp.SKCanvas skCanvas)
+    public void Draw(CanvasCommand canvasCommand, SkiaSharp.SKCanvas skCanvas, bool wireframe = false)
     {
         switch (canvasCommand)
         {
@@ -1289,7 +1289,9 @@ public void Draw(CanvasCommand canvasCommand, SkiaSharp.SKCanvas skCanvas)
             {
                 if (saveLayerCanvasCommand.Paint is { })
                 {
-                    var paint = ToSKPaint(saveLayerCanvasCommand.Paint);
+                    var paint = wireframe
+                        ? ToWireframePaint(saveLayerCanvasCommand.Paint)
+                        : ToSKPaint(saveLayerCanvasCommand.Paint);
                     skCanvas.SaveLayer(paint);
                 }
                 else
@@ -1302,11 +1304,20 @@ public void Draw(CanvasCommand canvasCommand, SkiaSharp.SKCanvas skCanvas)
             {
                 if (drawImageCanvasCommand.Image is { })
                 {
-                    var image = ToSKImage(drawImageCanvasCommand.Image);
-                    var source = ToSKRect(drawImageCanvasCommand.Source);
-                    var dest = ToSKRect(drawImageCanvasCommand.Dest);
-                    var paint = ToSKPaint(drawImageCanvasCommand.Paint);
-                    skCanvas.DrawImage(image, source, dest, paint);
+                    if (wireframe)
+                    {
+                        var rectPath = new SKPath();
+                        rectPath.AddRect(drawImageCanvasCommand.Dest);
+                        skCanvas.DrawPath(rectPath, ToWireframePaint(null));
+                    }
+                    else
+                    {
+                        var image = ToSKImage(drawImageCanvasCommand.Image);
+                        var source = ToSKRect(drawImageCanvasCommand.Source);
+                        var dest = ToSKRect(drawImageCanvasCommand.Dest);
+                        var paint = ToSKPaint(drawImageCanvasCommand.Paint);
+                        skCanvas.DrawImage(image, source, dest, paint);
+                    }
                 }
                 break;
             }
@@ -1315,7 +1326,9 @@ public void Draw(CanvasCommand canvasCommand, SkiaSharp.SKCanvas skCanvas)
                 if (drawPathCanvasCommand.Path is { } && drawPathCanvasCommand.Paint is { })
                 {
                     var path = ToSKPath(drawPathCanvasCommand.Path);
-                    var paint = ToSKPaint(drawPathCanvasCommand.Paint);
+                    var paint = wireframe
+                        ? ToWireframePaint(drawPathCanvasCommand.Paint)
+                        : ToSKPaint(drawPathCanvasCommand.Paint);
                     skCanvas.DrawPath(path, paint);
                 }
                 break;
@@ -1326,7 +1339,9 @@ public void Draw(CanvasCommand canvasCommand, SkiaSharp.SKCanvas skCanvas)
                 {
                     var text = drawPositionedTextCanvasCommand.TextBlob.Text;
                     var points = ToSKPoints(drawPositionedTextCanvasCommand.TextBlob.Points);
-                    var paint = ToSKPaint(drawPositionedTextCanvasCommand.Paint);
+                    var paint = wireframe
+                        ? ToWireframePaint(drawPositionedTextCanvasCommand.Paint)
+                        : ToSKPaint(drawPositionedTextCanvasCommand.Paint);
                     var font = paint?.ToFont();
                     var textBlob = SkiaSharp.SKTextBlob.CreatePositioned(text, font, points);
                     skCanvas.DrawText(textBlob, 0, 0, paint);
@@ -1340,7 +1355,9 @@ public void Draw(CanvasCommand canvasCommand, SkiaSharp.SKCanvas skCanvas)
                     var text = drawTextCanvasCommand.Text;
                     var x = drawTextCanvasCommand.X;
                     var y = drawTextCanvasCommand.Y;
-                    var paint = ToSKPaint(drawTextCanvasCommand.Paint);
+                    var paint = wireframe
+                        ? ToWireframePaint(drawTextCanvasCommand.Paint)
+                        : ToSKPaint(drawTextCanvasCommand.Paint);
                     skCanvas.DrawText(text, x, y, paint);
                 }
                 break;
@@ -1353,7 +1370,9 @@ public void Draw(CanvasCommand canvasCommand, SkiaSharp.SKCanvas skCanvas)
                     var path = ToSKPath(drawTextOnPathCanvasCommand.Path);
                     var hOffset = drawTextOnPathCanvasCommand.HOffset;
                     var vOffset = drawTextOnPathCanvasCommand.VOffset;
-                    var paint = ToSKPaint(drawTextOnPathCanvasCommand.Paint);
+                    var paint = wireframe
+                        ? ToWireframePaint(drawTextOnPathCanvasCommand.Paint)
+                        : ToSKPaint(drawTextOnPathCanvasCommand.Paint);
                     skCanvas.DrawTextOnPath(text, path, hOffset, vOffset, paint);
                 }
                 break;
@@ -1361,7 +1380,7 @@ public void Draw(CanvasCommand canvasCommand, SkiaSharp.SKCanvas skCanvas)
         }
     }
 
-    public void Draw(SKPicture picture, SkiaSharp.SKCanvas skCanvas)
+    public void Draw(SKPicture picture, SkiaSharp.SKCanvas skCanvas, bool wireframe = false)
     {
         if (picture.Commands is null)
         {
@@ -1370,82 +1389,27 @@ public void Draw(SKPicture picture, SkiaSharp.SKCanvas skCanvas)
 
         foreach (var canvasCommand in picture.Commands)
         {
-            Draw(canvasCommand, skCanvas);
+            Draw(canvasCommand, skCanvas, wireframe);
         }
     }
 
     private SKPaint ToWireframePaint(SKPaint? paint)
     {
-        var result = paint?.Clone() ?? new SKPaint();
-        result.Style = SKPaintStyle.Stroke;
-        result.Color = new SKColor(128, 128, 128, 255);
-        if (result.StrokeWidth == 0)
+        var result = new SKPaint
         {
-            result.StrokeWidth = 1;
-        }
+            Style = SKPaintStyle.Stroke,
+            StrokeWidth = 1,
+            Color = new SKColor(128, 128, 128, 255),
+            IsAntialias = paint?.IsAntialias ?? false,
+            StrokeCap = paint?.StrokeCap ?? SKStrokeCap.Butt,
+            StrokeJoin = paint?.StrokeJoin ?? SKStrokeJoin.Miter,
+            StrokeMiter = paint?.StrokeMiter ?? 4
+        };
         return result;
     }
 
-    private SKPicture ToWireframePicture(SKPicture picture)
-    {
-        if (picture.Commands is null)
-        {
-            return new SKPicture(picture.CullRect, null);
-        }
-
-        var recorder = new SKPictureRecorder();
-        var canvas = recorder.BeginRecording(picture.CullRect);
-
-        foreach (var cmd in picture.Commands)
-        {
-            switch (cmd)
-            {
-                case ClipPathCanvasCommand clipPath:
-                    canvas.ClipPath(clipPath.ClipPath!, clipPath.Operation, clipPath.Antialias);
-                    break;
-                case ClipRectCanvasCommand clipRect:
-                    canvas.ClipRect(clipRect.Rect, clipRect.Operation, clipRect.Antialias);
-                    break;
-                case SaveCanvasCommand:
-                    canvas.Save();
-                    break;
-                case RestoreCanvasCommand:
-                    canvas.Restore();
-                    break;
-                case SetMatrixCanvasCommand setMatrix:
-                    canvas.SetMatrix(setMatrix.DeltaMatrix);
-                    break;
-                case SaveLayerCanvasCommand saveLayer:
-                    canvas.SaveLayer(ToWireframePaint(saveLayer.Paint));
-                    break;
-                case DrawPathCanvasCommand drawPath when drawPath.Path is { }:
-                    canvas.DrawPath(drawPath.Path, ToWireframePaint(drawPath.Paint));
-                    break;
-                case DrawImageCanvasCommand drawImage:
-                {
-                    var rectPath = new SKPath();
-                    rectPath.AddRect(drawImage.Dest);
-                    canvas.DrawPath(rectPath, ToWireframePaint(null));
-                    break;
-                }
-                case DrawTextBlobCanvasCommand drawBlob when drawBlob.Paint is { }:
-                    canvas.DrawText(drawBlob.TextBlob!, drawBlob.X, drawBlob.Y, ToWireframePaint(drawBlob.Paint));
-                    break;
-                case DrawTextCanvasCommand drawText when drawText.Paint is { }:
-                    canvas.DrawText(drawText.Text, drawText.X, drawText.Y, ToWireframePaint(drawText.Paint));
-                    break;
-                case DrawTextOnPathCanvasCommand drawTextOnPath when drawTextOnPath.Paint is { } && drawTextOnPath.Path is { }:
-                    canvas.DrawTextOnPath(drawTextOnPath.Text, drawTextOnPath.Path, drawTextOnPath.HOffset, drawTextOnPath.VOffset, ToWireframePaint(drawTextOnPath.Paint));
-                    break;
-            }
-        }
-
-        return recorder.EndRecording();
-    }
-
     public void DrawWireframe(SKPicture picture, SkiaSharp.SKCanvas skCanvas)
     {
-        var wfPicture = ToWireframePicture(picture);
-        Draw(wfPicture, skCanvas);
+        Draw(picture, skCanvas, true);
     }
 }

From fd49d5b745bcd16e19ed835fcf6d6fc39054ceae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?=
 <wieslawsoltes@users.noreply.github.com>
Date: Tue, 15 Jul 2025 12:46:33 +0200
Subject: [PATCH 06/10] Normalize global.json

---
 src/Svg.Skia/SkiaModel.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Svg.Skia/SkiaModel.cs b/src/Svg.Skia/SkiaModel.cs
index a59202edf3..7e9cca0491 100644
--- a/src/Svg.Skia/SkiaModel.cs
+++ b/src/Svg.Skia/SkiaModel.cs
@@ -1306,7 +1306,7 @@ public void Draw(CanvasCommand canvasCommand, SkiaSharp.SKCanvas skCanvas, bool
                 {
                     if (wireframe)
                     {
-                        var rectPath = new SKPath();
+                        var rectPath = new SkiaSharp.SKPath();
                         rectPath.AddRect(drawImageCanvasCommand.Dest);
                         skCanvas.DrawPath(rectPath, ToWireframePaint(null));
                     }
@@ -1393,11 +1393,11 @@ public void Draw(SKPicture picture, SkiaSharp.SKCanvas skCanvas, bool wireframe
         }
     }
 
-    private SKPaint ToWireframePaint(SKPaint? paint)
+    private SkiaSharp.SKPaint ToWireframePaint(SKPaint? paint)
     {
-        var result = new SKPaint
+        var result = new SkiaSharp.SKPaint
         {
-            Style = SKPaintStyle.Stroke,
+            Style = SkiaSharp.SKPaintStyle.Stroke,
             StrokeWidth = 1,
             Color = new SKColor(128, 128, 128, 255),
             IsAntialias = paint?.IsAntialias ?? false,

From edf962946ea1672bbe9c5ffc78a8c41ab8c94281 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?=
 <wieslawsoltes@users.noreply.github.com>
Date: Tue, 15 Jul 2025 12:56:37 +0200
Subject: [PATCH 07/10] Fix wireframe conversions

---
 src/Svg.Skia/SkiaModel.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Svg.Skia/SkiaModel.cs b/src/Svg.Skia/SkiaModel.cs
index 7e9cca0491..99e158fb21 100644
--- a/src/Svg.Skia/SkiaModel.cs
+++ b/src/Svg.Skia/SkiaModel.cs
@@ -1307,7 +1307,7 @@ public void Draw(CanvasCommand canvasCommand, SkiaSharp.SKCanvas skCanvas, bool
                     if (wireframe)
                     {
                         var rectPath = new SkiaSharp.SKPath();
-                        rectPath.AddRect(drawImageCanvasCommand.Dest);
+                        rectPath.AddRect(ToSKRect(drawImageCanvasCommand.Dest));
                         skCanvas.DrawPath(rectPath, ToWireframePaint(null));
                     }
                     else
@@ -1399,10 +1399,10 @@ private SkiaSharp.SKPaint ToWireframePaint(SKPaint? paint)
         {
             Style = SkiaSharp.SKPaintStyle.Stroke,
             StrokeWidth = 1,
-            Color = new SKColor(128, 128, 128, 255),
+            Color = new SkiaSharp.SKColor(128, 128, 128, 255),
             IsAntialias = paint?.IsAntialias ?? false,
-            StrokeCap = paint?.StrokeCap ?? SKStrokeCap.Butt,
-            StrokeJoin = paint?.StrokeJoin ?? SKStrokeJoin.Miter,
+            StrokeCap = paint is null ? SkiaSharp.SKStrokeCap.Butt : ToSKStrokeCap(paint.StrokeCap),
+            StrokeJoin = paint is null ? SkiaSharp.SKStrokeJoin.Miter : ToSKStrokeJoin(paint.StrokeJoin),
             StrokeMiter = paint?.StrokeMiter ?? 4
         };
         return result;

From edb7cfdc27c2c30209c708dc15801766e1d197ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?=
 <wieslawsoltes@users.noreply.github.com>
Date: Tue, 15 Jul 2025 13:21:24 +0200
Subject: [PATCH 08/10] Improve wireframe paint conversion

---
 src/Svg.Skia/SkiaModel.cs | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/Svg.Skia/SkiaModel.cs b/src/Svg.Skia/SkiaModel.cs
index 99e158fb21..eaa9f50bd6 100644
--- a/src/Svg.Skia/SkiaModel.cs
+++ b/src/Svg.Skia/SkiaModel.cs
@@ -1395,17 +1395,38 @@ public void Draw(SKPicture picture, SkiaSharp.SKCanvas skCanvas, bool wireframe
 
     private SkiaSharp.SKPaint ToWireframePaint(SKPaint? paint)
     {
-        var result = new SkiaSharp.SKPaint
+        var strokeCap = paint is null ? SkiaSharp.SKStrokeCap.Butt : ToSKStrokeCap(paint.StrokeCap);
+        var strokeJoin = paint is null ? SkiaSharp.SKStrokeJoin.Miter : ToSKStrokeJoin(paint.StrokeJoin);
+        var textAlign = paint is null ? SkiaSharp.SKTextAlign.Left : ToSKTextAlign(paint.TextAlign);
+        var typeface = paint is null ? null : ToSKTypeface(paint.Typeface);
+        var textEncoding = paint is null ? SkiaSharp.SKTextEncoding.Utf8 : ToSKTextEncoding(paint.TextEncoding);
+        var colorFilter = paint is null ? null : ToSKColorFilter(paint.ColorFilter);
+        var imageFilter = paint is null ? null : ToSKImageFilter(paint.ImageFilter);
+        var pathEffect = paint is null ? null : ToSKPathEffect(paint.PathEffect);
+        var blendMode = paint is null ? SkiaSharp.SKBlendMode.SrcOver : ToSKBlendMode(paint.BlendMode);
+        var filterQuality = paint is null ? SkiaSharp.SKFilterQuality.None : ToSKFilterQuality(paint.FilterQuality);
+
+        return new SkiaSharp.SKPaint
         {
             Style = SkiaSharp.SKPaintStyle.Stroke,
-            StrokeWidth = 1,
-            Color = new SkiaSharp.SKColor(128, 128, 128, 255),
             IsAntialias = paint?.IsAntialias ?? false,
-            StrokeCap = paint is null ? SkiaSharp.SKStrokeCap.Butt : ToSKStrokeCap(paint.StrokeCap),
-            StrokeJoin = paint is null ? SkiaSharp.SKStrokeJoin.Miter : ToSKStrokeJoin(paint.StrokeJoin),
-            StrokeMiter = paint?.StrokeMiter ?? 4
+            StrokeWidth = 0,
+            StrokeCap = strokeCap,
+            StrokeJoin = strokeJoin,
+            StrokeMiter = paint?.StrokeMiter ?? 4,
+            TextSize = paint?.TextSize ?? 0,
+            TextAlign = textAlign,
+            Typeface = typeface,
+            LcdRenderText = paint?.LcdRenderText ?? false,
+            SubpixelText = paint?.SubpixelText ?? false,
+            TextEncoding = textEncoding,
+            Color = new SkiaSharp.SKColor(128, 128, 128, 255),
+            ColorFilter = colorFilter,
+            ImageFilter = imageFilter,
+            PathEffect = pathEffect,
+            BlendMode = blendMode,
+            FilterQuality = filterQuality
         };
-        return result;
     }
 
     public void DrawWireframe(SKPicture picture, SkiaSharp.SKCanvas skCanvas)

From 49c0ca9418858976ecabc0699e96e26e143a0bfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?=
 <wieslawsoltes@users.noreply.github.com>
Date: Tue, 15 Jul 2025 15:06:18 +0200
Subject: [PATCH 09/10] Improve wireframe picture rendering

---
 src/Svg.Controls.Skia.Avalonia/Svg.cs | 14 +++++++++-
 src/Svg.Skia/SKSvg.Model.cs           | 38 +++++++++++++++++++++++++--
 src/Svg.Skia/SkiaModel.cs             | 16 +++++++++++
 3 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/src/Svg.Controls.Skia.Avalonia/Svg.cs b/src/Svg.Controls.Skia.Avalonia/Svg.cs
index de2c3efcfd..c4e45722a9 100644
--- a/src/Svg.Controls.Skia.Avalonia/Svg.cs
+++ b/src/Svg.Controls.Skia.Avalonia/Svg.cs
@@ -133,7 +133,15 @@ public bool EnableCache
     public bool Wireframe
     {
         get { return _wireframe; }
-        set { SetAndRaise(WireframeProperty, ref _wireframe, value); }
+        set
+        {
+            SetAndRaise(WireframeProperty, ref _wireframe, value);
+            if (_svg?.Svg is { } skSvg)
+            {
+                skSvg.Wireframe = value;
+                skSvg.ClearWireframePicture();
+            }
+        }
     }
 
     /// <summary>
@@ -398,6 +406,7 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
             if (_svg?.Svg is { } skSvg)
             {
                 skSvg.Wireframe = change.GetNewValue<bool>();
+                skSvg.ClearWireframePicture();
             }
             InvalidateVisual();
         }
@@ -419,6 +428,7 @@ private void LoadFromPath(string? path, SvgParameters? parameters = null)
             if (_svg.Svg is { } skSvg)
             {
                 skSvg.Wireframe = _wireframe;
+                skSvg.ClearWireframePicture();
             }
             return;
         }
@@ -435,6 +445,7 @@ private void LoadFromPath(string? path, SvgParameters? parameters = null)
             if (_svg?.Svg is { } skSvg2)
             {
                 skSvg2.Wireframe = _wireframe;
+                skSvg2.ClearWireframePicture();
             }
 
             if (_enableCache && _cache is { } && _svg is { })
@@ -467,6 +478,7 @@ private void LoadFromSource(string? source, SvgParameters? parameters = null)
             if (_svg?.Svg is { } skSvg)
             {
                 skSvg.Wireframe = _wireframe;
+                skSvg.ClearWireframePicture();
             }
         }
         catch (Exception e)
diff --git a/src/Svg.Skia/SKSvg.Model.cs b/src/Svg.Skia/SKSvg.Model.cs
index 2b2f3c0cc2..50581f1848 100644
--- a/src/Svg.Skia/SKSvg.Model.cs
+++ b/src/Svg.Skia/SKSvg.Model.cs
@@ -102,7 +102,24 @@ public static void Draw(SkiaSharp.SKCanvas skCanvas, string path, SkiaModel skia
 
     public virtual SkiaSharp.SKPicture? Picture { get; protected set; }
 
-    public bool Wireframe { get; set; }
+    public SkiaSharp.SKPicture? WireframePicture { get; protected set; }
+
+    private bool _wireframe;
+    public bool Wireframe
+    {
+        get => _wireframe;
+        set
+        {
+            _wireframe = value;
+            ClearWireframePicture();
+        }
+    }
+
+    public void ClearWireframePicture()
+    {
+        WireframePicture?.Dispose();
+        WireframePicture = null;
+    }
 
     public event EventHandler<SKSvgDrawEventArgs>? OnDraw;
 
@@ -155,6 +172,8 @@ public SKSvg()
         Model = SvgService.ToModel(svgDocument, AssetLoader, out var drawable, out _);
         Drawable = drawable;
         Picture = SkiaModel.ToSKPicture(Model);
+        WireframePicture?.Dispose();
+        WireframePicture = null;
 
         return Picture;
     }
@@ -176,6 +195,8 @@ public SKSvg()
         Model = SvgService.ToModel(svgDocument, AssetLoader, out var drawable, out _);
         Drawable = drawable;
         Picture = SkiaModel.ToSKPicture(Model);
+        WireframePicture?.Dispose();
+        WireframePicture = null;
 
         return Picture;
     }
@@ -190,6 +211,8 @@ public SKSvg()
             Model = SvgService.ToModel(svgDocument, AssetLoader, out var drawable, out _);
             Drawable = drawable;
             Picture = SkiaModel.ToSKPicture(Model);
+            WireframePicture?.Dispose();
+            WireframePicture = null;
             return Picture;
         }
         return null;
@@ -227,6 +250,8 @@ public SKSvg()
             Model = SvgService.ToModel(svgDocument, AssetLoader, out var drawable, out _);
             Drawable = drawable;
             Picture = SkiaModel.ToSKPicture(Model);
+            WireframePicture?.Dispose();
+            WireframePicture = null;
             return Picture;
         }
         return null;
@@ -239,6 +264,8 @@ public SKSvg()
             Model = SvgService.ToModel(svgDocument, AssetLoader, out var drawable, out _);
             Drawable = drawable;
             Picture = SkiaModel.ToSKPicture(Model);
+            WireframePicture?.Dispose();
+            WireframePicture = null;
             return Picture;
         }
         return null;
@@ -274,7 +301,11 @@ public void Draw(SkiaSharp.SKCanvas canvas)
         canvas.Save();
         if (Wireframe && Model is { })
         {
-            SkiaModel.Draw(Model, canvas, true);
+            WireframePicture ??= SkiaModel.ToWireframePicture(Model);
+            if (WireframePicture is { })
+            {
+                canvas.DrawPicture(WireframePicture);
+            }
         }
         else
         {
@@ -294,6 +325,9 @@ private void Reset()
 
             Picture?.Dispose();
             Picture = null;
+
+            WireframePicture?.Dispose();
+            WireframePicture = null;
         }
     }
 
diff --git a/src/Svg.Skia/SkiaModel.cs b/src/Svg.Skia/SkiaModel.cs
index eaa9f50bd6..605a89e6f2 100644
--- a/src/Svg.Skia/SkiaModel.cs
+++ b/src/Svg.Skia/SkiaModel.cs
@@ -1246,6 +1246,22 @@ public SKPath FromSKPath(SkiaSharp.SKPath skPath)
         return skPictureRecorder.EndRecording();
     }
 
+    public SkiaSharp.SKPicture? ToWireframePicture(SKPicture? picture)
+    {
+        if (picture is null)
+        {
+            return null;
+        }
+
+        var skRect = ToSKRect(picture.CullRect);
+        using var skPictureRecorder = new SkiaSharp.SKPictureRecorder();
+        using var skCanvas = skPictureRecorder.BeginRecording(skRect);
+
+        Draw(picture, skCanvas, true);
+
+        return skPictureRecorder.EndRecording();
+    }
+
     public void Draw(CanvasCommand canvasCommand, SkiaSharp.SKCanvas skCanvas, bool wireframe = false)
     {
         switch (canvasCommand)

From 444792c3e2e0ab93cb7f6c2fa6283591a01495dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?=
 <wieslawsoltes@users.noreply.github.com>
Date: Tue, 15 Jul 2025 17:27:10 +0200
Subject: [PATCH 10/10] Clean up wireframe property

---
 src/Svg.Controls.Skia.Avalonia/Svg.cs | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/Svg.Controls.Skia.Avalonia/Svg.cs b/src/Svg.Controls.Skia.Avalonia/Svg.cs
index c4e45722a9..8d55729ddf 100644
--- a/src/Svg.Controls.Skia.Avalonia/Svg.cs
+++ b/src/Svg.Controls.Skia.Avalonia/Svg.cs
@@ -133,15 +133,7 @@ public bool EnableCache
     public bool Wireframe
     {
         get { return _wireframe; }
-        set
-        {
-            SetAndRaise(WireframeProperty, ref _wireframe, value);
-            if (_svg?.Svg is { } skSvg)
-            {
-                skSvg.Wireframe = value;
-                skSvg.ClearWireframePicture();
-            }
-        }
+        set { SetAndRaise(WireframeProperty, ref _wireframe, value); }
     }
 
     /// <summary>