From 24635ea218c1cfd6888f3c72a284aacbf6bedc7c Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Sun, 29 Jan 2017 23:46:22 +0100 Subject: [PATCH] Added in-tree visual brush test. Expected output is slightly wonky - need to investigate that once stuff's working in general. --- .../Media/VisualBrushTests.cs | 36 ++++++++++++++++++ .../VisualBrush_InTree_Visual.expected.png | Bin 0 -> 5574 bytes 2 files changed, 36 insertions(+) create mode 100644 tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_InTree_Visual.expected.png diff --git a/tests/Avalonia.RenderTests/Media/VisualBrushTests.cs b/tests/Avalonia.RenderTests/Media/VisualBrushTests.cs index a50bd1a2c9..c302ddbe33 100644 --- a/tests/Avalonia.RenderTests/Media/VisualBrushTests.cs +++ b/tests/Avalonia.RenderTests/Media/VisualBrushTests.cs @@ -425,5 +425,41 @@ namespace Avalonia.Direct2D1.RenderTests.Media RenderToFile(target); CompareImages(); } + + [Fact] + public void VisualBrush_InTree_Visual() + { + TextBlock source; + Decorator target = new Decorator + { + Padding = new Thickness(8), + Width = 200, + Height = 200, + Child = new Grid + { + RowDefinitions = new RowDefinitions("Auto,*"), + Children = + { + (source = new TextBlock + { + HorizontalAlignment = HorizontalAlignment.Left, + Text = "Visual" + }), + new Rectangle + { + Fill = new VisualBrush + { + Stretch = Stretch.Uniform, + Visual = source, + }, + [Grid.RowProperty] = 1, + } + } + } + }; + + RenderToFile(target); + CompareImages(); + } } } diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_InTree_Visual.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_InTree_Visual.expected.png new file mode 100644 index 0000000000000000000000000000000000000000..e60d8bff768561f60286480f52cf4c151c2227d5 GIT binary patch literal 5574 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