Apply Alignments to TileBrushes with uniform stretch (#15846)

* add tiled brush alignment cross tests * apply Alignments to TileBrushes with uniform stretch
AvaloniaUI · May 29, 2024 · 861c0e4 · 861c0e4
1 parent 22231f5
commit 861c0e4
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 3 deletions.
diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
@@ -1168,10 +1168,12 @@ private void ConfigureSceneBrushContentWithPicture(ref PaintWrapper paintWrapper
 
             brushTransform *= Matrix.CreateTranslation(-sourceRect.Position);
 
+            var scale = Vector.One;
+
             if (sourceRect.Size != destinationRect.Size)
             {
                 //scale source to destination size
-                var scale = tileBrush.Stretch.CalculateScaling(destinationRect.Size, sourceRect.Size);
+                scale = tileBrush.Stretch.CalculateScaling(destinationRect.Size, sourceRect.Size);
 
                 var scaleTransform = Matrix.CreateScale(scale);
 
@@ -1197,11 +1199,11 @@ private void ConfigureSceneBrushContentWithPicture(ref PaintWrapper paintWrapper
                 }
             }
 
-            if (tileBrush.Stretch == Stretch.None && transform == Matrix.Identity)
+            if (tileBrush.Stretch != Stretch.Fill && transform == Matrix.Identity)
             {
                 //align content
                 var alignmentOffset = TileBrushCalculator.CalculateTranslate(tileBrush.AlignmentX, tileBrush.AlignmentY,
-                    contentBounds, destinationRect, Vector.One);
+                    contentBounds, destinationRect, tileBrush.Stretch == Stretch.None ? Vector.One : scale);
 
                 brushTransform *= Matrix.CreateTranslation(alignmentOffset);
             }

diff --git a/tests/Avalonia.RenderTests/CrossTests/Brushes/CrossTileBrushTests.cs b/tests/Avalonia.RenderTests/CrossTests/Brushes/CrossTileBrushTests.cs
@@ -78,6 +78,36 @@ public void Should_Render_Scaled_TileBrush()
 
     }
 
+    [CrossFact]
+    public void Should_Render_Aligned_TileBrush()
+    {
+        var brush = new CrossDrawingBrush
+        {
+            TileMode = TileMode.Tile,
+            AlignmentX = AlignmentX.Center,
+            AlignmentY = AlignmentY.Center,
+            Stretch = Stretch.Uniform,
+            Drawing = new CrossDrawingGroup()
+            {
+                Children = new List<CrossDrawing>()
+                {
+                    new CrossGeometryDrawing(new CrossRectangleGeometry(new(0, 0, 100, 150)))
+                    {
+                        Brush = new CrossSolidColorBrush(Colors.Crimson)
+                    },
+                }
+            }
+        };
+
+        RenderAndCompare(new CrossControl()
+        {
+            Width = 100,
+            Height = 100,
+            Background = brush
+        });
+
+    }
+
     [CrossFact]
     public void Should_Render_With_Transform()
     {

diff --git a/.../TestFiles/CrossTests/Media/TileBrushes/Should_Render_Aligned_TileBrush.wpf.png b/.../TestFiles/CrossTests/Media/TileBrushes/Should_Render_Aligned_TileBrush.wpf.png