Merge pull request #228 from VladimirDrobyshev/master

Fix for the "DrawingContext.DrawImage() method not draws an SvgImage in some cases" issue

samples/AvaloniaSvgSkiaSample/DrawControl.axaml

@@ -0,0 +1,8 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="AvaloniaSvgSkiaSample.DrawControl">
+</UserControl>
+

samples/AvaloniaSvgSkiaSample/DrawControl.axaml.cs

@@ -0,0 +1,25 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Media;
+using Avalonia.Svg.Skia;
+
+namespace AvaloniaSvgSkiaSample;
+
+public partial class DrawControl : UserControl
+{
+    public SvgImage Image { get; set; }
+
+    public DrawControl()
+    {
+        InitializeComponent();
+    }
+
+    public override void Render(DrawingContext context)
+    {
+        var center = Bounds.Center;
+        var width = Image.Size.Width / 2;
+        var height = Image.Size.Width / 2;
+        context.DrawImage(Image, new Rect(center.X - 0.5 * width, center.Y - 0.5 * height, width, height));
+    }
+}
+

samples/AvaloniaSvgSkiaSample/MainWindow.axaml

@@ -3,6 +3,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:svg="clr-namespace:Avalonia.Svg.Skia;assembly=Avalonia.Svg.Skia"
+        xmlns:local="clr-namespace:AvaloniaSvgSkiaSample"
         mc:Ignorable="d" d:DesignWidth="900" d:DesignHeight="600"
         x:Class="AvaloniaSvgSkiaSample.MainWindow"
         Width="900" Height="600" WindowStartupLocation="CenterScreen"
@@ -146,6 +147,17 @@
       </DockPanel>
     </TabItem>
 
+    <TabItem Header="Context.Draw()">
+      <DockPanel x:Name="svgDrawDockPanel" 
+                 Background="Transparent" 
+                 Margin="16" 
+                 VerticalAlignment="Stretch"
+                 HorizontalAlignment="Stretch" 
+                 DragDrop.AllowDrop="True">
+        <local:DrawControl Image="{SvgImage /Assets/__tiger.svg}" />
+      </DockPanel>
+    </TabItem>
+
   </TabControl>
 
 </Window>

src/Avalonia.Controls.Skia/SKBitmapControl.cs

@@ -123,7 +123,7 @@ public override void Render(DrawingContext context)
         }
 
         using (context.PushClip(destRect))
-        using (context.PushTransform(translateMatrix * scaleMatrix))
+        using (context.PushTransform(scaleMatrix * translateMatrix))
         {
             context.Custom(new SKBitmapDrawOperation(new Rect(0, 0, bounds.Width, bounds.Height), bitmap));
         }

src/Avalonia.Controls.Skia/SKBitmapImage.cs

@@ -46,7 +46,7 @@ void IImage.Draw(DrawingContext context, Rect sourceRect, Rect destRect)
         var scaleMatrix = Matrix.CreateScale(destRect.Width / sourceRect.Width, destRect.Height / sourceRect.Height);
         var translateMatrix = Matrix.CreateTranslation(-sourceRect.X + destRect.X - bounds.Top, -sourceRect.Y + destRect.Y - bounds.Left);
         using (context.PushClip(destRect))
-        using (context.PushTransform(translateMatrix * scaleMatrix))
+        using (context.PushTransform(scaleMatrix * translateMatrix))
         {
             context.Custom(new SKBitmapDrawOperation(new Rect(0, 0, bounds.Width, bounds.Height), source));
         }

src/Avalonia.Controls.Skia/SKPathControl.cs

@@ -140,7 +140,7 @@ public override void Render(DrawingContext context)
         }
 
         using (context.PushClip(destRect))
-        using (context.PushTransform(translateMatrix * scaleMatrix))
+        using (context.PushTransform(scaleMatrix * translateMatrix))
         {
             context.Custom(
                 new SKPathDrawOperation(

src/Avalonia.Controls.Skia/SKPathImage.cs

@@ -66,7 +66,7 @@ void IImage.Draw(DrawingContext context, Rect sourceRect, Rect destRect)
         var scaleMatrix = Matrix.CreateScale(destRect.Width / sourceRect.Width, destRect.Height / sourceRect.Height);
         var translateMatrix = Matrix.CreateTranslation(-sourceRect.X + destRect.X - bounds.Top, -sourceRect.Y + destRect.Y - bounds.Left);
         using (context.PushClip(destRect))
-        using (context.PushTransform(translateMatrix * scaleMatrix))
+        using (context.PushTransform(scaleMatrix * translateMatrix))
         {
             context.Custom(new SKPathDrawOperation(new Rect(0, 0, bounds.Width, bounds.Height), source, paint));
         }

src/Avalonia.Controls.Skia/SKPictureControl.cs

@@ -123,7 +123,7 @@ public override void Render(DrawingContext context)
         }
 
         using (context.PushClip(destRect))
-        using (context.PushTransform(translateMatrix * scaleMatrix))
+        using (context.PushTransform(scaleMatrix * translateMatrix))
         {
             context.Custom(
                 new SKPictureDrawOperation(

src/Avalonia.Controls.Skia/SKPictureImage.cs

@@ -46,7 +46,7 @@ void IImage.Draw(DrawingContext context, Rect sourceRect, Rect destRect)
         var scaleMatrix = Matrix.CreateScale(destRect.Width / sourceRect.Width, destRect.Height / sourceRect.Height);
         var translateMatrix = Matrix.CreateTranslation(-sourceRect.X + destRect.X - bounds.Top, -sourceRect.Y + destRect.Y - bounds.Left);
         using (context.PushClip(destRect))
-        using (context.PushTransform(translateMatrix * scaleMatrix))
+        using (context.PushTransform(scaleMatrix * translateMatrix))
         {
             context.Custom(new SKPictureDrawOperation(new Rect(0, 0, bounds.Width, bounds.Height), source));
         }

src/Avalonia.Svg.Skia/Svg.cs

@@ -230,7 +230,7 @@ public override void Render(DrawingContext context)
             -sourceRect.Y + destRect.Y - bounds.Left);
 
         using (context.PushClip(destRect))
-        using (context.PushTransform(translateMatrix * scaleMatrix))
+        using (context.PushTransform(scaleMatrix * translateMatrix))
         {
             context.Custom(
                 new SvgSourceCustomDrawOperation(

src/Avalonia.Svg.Skia/SvgImage.cs

@@ -88,7 +88,7 @@ void IImage.Draw(DrawingContext context, Rect sourceRect, Rect destRect)
             -sourceRect.X + destRect.X - bounds.Top,
             -sourceRect.Y + destRect.Y - bounds.Left);
         using (context.PushClip(destRect))
-        using (context.PushTransform(translateMatrix * scaleMatrix))
+        using (context.PushTransform(scaleMatrix * translateMatrix))
         {
             context.Custom(
                 new SvgSourceCustomDrawOperation(

src/Avalonia.Svg/Svg.cs

@@ -213,7 +213,7 @@ public override void Render(DrawingContext context)
             -sourceRect.Y + destRect.Y - bounds.Left);
 
         using (context.PushClip(destRect))
-        using (context.PushTransform(translateMatrix * scaleMatrix))
+        using (context.PushTransform(scaleMatrix * translateMatrix))
         {
             if (_avaloniaPicture is { })
             {

src/Avalonia.Svg/SvgImage.cs

@@ -69,7 +69,7 @@ void IImage.Draw(
             -sourceRect.X + destRect.X - bounds.Top,
             -sourceRect.Y + destRect.Y - bounds.Left);
         using (context.PushClip(destRect))
-        using (context.PushTransform(translateMatrix * scaleMatrix))
+        using (context.PushTransform(scaleMatrix * translateMatrix))
         {
             try
             {