From 48dd3b94d1ad0d1ea8dbc2c4e6c859196862c821 Mon Sep 17 00:00:00 2001 From: Karnah Date: Tue, 26 Jun 2018 11:28:45 +0500 Subject: [PATCH] Using transparent brush when image source is null --- src/Skia/Avalonia.Skia/DrawingContextImpl.cs | 4 ++++ .../Avalonia.RenderTests/Media/ImageBrushTests.cs | 1 + .../ImageBrush/ImageBrush_NullSource.expected.png | Bin 0 -> 250 bytes .../ImageBrush/ImageBrush_NullSource.expected.png | Bin 0 -> 250 bytes 4 files changed, 5 insertions(+) create mode 100644 tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NullSource.expected.png create mode 100644 tests/TestFiles/Skia/Media/ImageBrush/ImageBrush_NullSource.expected.png diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs index b7ce6eedc4..d2c4bd0aa1 100644 --- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs +++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs @@ -491,6 +491,10 @@ namespace Avalonia.Skia { ConfigureTileBrush(ref paintWrapper, targetSize, tileBrush, tileBrushImage); } + else + { + paint.Color = new SKColor(255, 255, 255, 0); + } return paintWrapper; } diff --git a/tests/Avalonia.RenderTests/Media/ImageBrushTests.cs b/tests/Avalonia.RenderTests/Media/ImageBrushTests.cs index d1f51a1a0c..3a41585d04 100644 --- a/tests/Avalonia.RenderTests/Media/ImageBrushTests.cs +++ b/tests/Avalonia.RenderTests/Media/ImageBrushTests.cs @@ -47,6 +47,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media }; await RenderToFile(target); + CompareImages(); } [Fact] diff --git a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NullSource.expected.png b/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NullSource.expected.png new file mode 100644 index 0000000000000000000000000000000000000000..4c9409ee63e2d96335b03121247027d66340b190 GIT binary patch literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yu@pObhHwBu4M$1`kiXH>#WAE} r&f9~Gj6hzK!vFPo9u6SpAO$s&h0homeHw~bKo0bD^>bP0l+XkKkl+`x literal 0 HcmV?d00001 diff --git a/tests/TestFiles/Skia/Media/ImageBrush/ImageBrush_NullSource.expected.png b/tests/TestFiles/Skia/Media/ImageBrush/ImageBrush_NullSource.expected.png new file mode 100644 index 0000000000000000000000000000000000000000..4c9409ee63e2d96335b03121247027d66340b190 GIT binary patch literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yu@pObhHwBu4M$1`kiXH>#WAE} r&f9~Gj6hzK!vFPo9u6SpAO$s&h0homeHw~bKo0bD^>bP0l+XkKkl+`x literal 0 HcmV?d00001