Fix transforms

wieslawsoltes · Aug 29, 2024 · 224c822 · 224c822
1 parent a477078
commit 224c822
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/src/Avalonia.Controls.Skia/SKBitmapControl.cs b/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));
         }

diff --git a/src/Avalonia.Controls.Skia/SKBitmapImage.cs b/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));
         }

diff --git a/src/Avalonia.Controls.Skia/SKPathControl.cs b/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(

diff --git a/src/Avalonia.Controls.Skia/SKPathImage.cs b/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));
         }

diff --git a/src/Avalonia.Controls.Skia/SKPictureControl.cs b/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(

diff --git a/src/Avalonia.Controls.Skia/SKPictureImage.cs b/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));
         }

diff --git a/src/Avalonia.Svg.Skia/Svg.cs b/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(

diff --git a/src/Avalonia.Svg/Svg.cs b/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 { })
             {

diff --git a/src/Avalonia.Svg/SvgImage.cs b/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
             {