From 6f079783616efceb68a3662beb77cf4fed867f37 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Mon, 30 Jan 2017 00:14:03 +0100 Subject: [PATCH] Updated test output. ImageMagick couldn't tell that the deferred renderer was failing the test previously!!?!? --- .../Media/VisualBrushTests.cs | 10 +++++++--- .../VisualBrush_InTree_Visual.expected.png | Bin 5574 -> 5905 bytes 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/Avalonia.RenderTests/Media/VisualBrushTests.cs b/tests/Avalonia.RenderTests/Media/VisualBrushTests.cs index c302ddbe33..15573f1d23 100644 --- a/tests/Avalonia.RenderTests/Media/VisualBrushTests.cs +++ b/tests/Avalonia.RenderTests/Media/VisualBrushTests.cs @@ -429,7 +429,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media [Fact] public void VisualBrush_InTree_Visual() { - TextBlock source; + Border source; Decorator target = new Decorator { Padding = new Thickness(8), @@ -440,10 +440,14 @@ namespace Avalonia.Direct2D1.RenderTests.Media RowDefinitions = new RowDefinitions("Auto,*"), Children = { - (source = new TextBlock + (source = new Border { + Background = Brushes.Yellow, HorizontalAlignment = HorizontalAlignment.Left, - Text = "Visual" + Child = new TextBlock + { + Text = "Visual" + } }), new Rectangle { diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_InTree_Visual.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_InTree_Visual.expected.png index e60d8bff768561f60286480f52cf4c151c2227d5..3725f2acbc06c0a3f653c1ce22813cfa46fef3b8 100644 GIT binary patch literal 5905 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