From b2b50090ba86ff298e650e86295b40a58e849a8b Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 4 Sep 2015 11:22:27 +0200
Subject: [PATCH] Added clipping to VisualBrush.DestinationRect.

---
 .../Rendering/RendererBase.cs                 |   4 +-
 .../Media/VisualBrushImpl.cs                  |   2 +-
 .../Media/VisualBrushTests.cs                 |  38 ++++++++++++++++++
 ...Rect_DestinationRect_Absolute.expected.png | Bin 0 -> 2031 bytes
 4 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_SourceRect_DestinationRect_Absolute.expected.png

diff --git a/src/Perspex.SceneGraph/Rendering/RendererBase.cs b/src/Perspex.SceneGraph/Rendering/RendererBase.cs
index 2dce69e3d0..d5b593d5e0 100644
--- a/src/Perspex.SceneGraph/Rendering/RendererBase.cs
+++ b/src/Perspex.SceneGraph/Rendering/RendererBase.cs
@@ -43,9 +43,11 @@ namespace Perspex.Rendering
         /// <param name="visual">The visual to render.</param>
         /// <param name="handle">An optional platform-specific handle.</param>
         /// <param name="transform">The transform.</param>
-        public virtual void Render(IVisual visual, IPlatformHandle handle, Matrix transform)
+        /// <param name="clip">An optional clip rectangle.</param>
+        public virtual void Render(IVisual visual, IPlatformHandle handle, Matrix transform, Rect? clip = null)
         {
             using (var context = this.CreateDrawingContext(handle))
+            using (clip.HasValue ? context.PushClip(clip.Value) : null)
             {
                 this.Render(visual, context, Matrix.Identity, transform);
             }
diff --git a/src/Windows/Perspex.Direct2D1/Media/VisualBrushImpl.cs b/src/Windows/Perspex.Direct2D1/Media/VisualBrushImpl.cs
index a1a7520fb2..d2467bbb86 100644
--- a/src/Windows/Perspex.Direct2D1/Media/VisualBrushImpl.cs
+++ b/src/Windows/Perspex.Direct2D1/Media/VisualBrushImpl.cs
@@ -40,7 +40,7 @@ namespace Perspex.Direct2D1.Media
                 var transform = Matrix.CreateTranslation(-sourceRect.Position) *
                                 Matrix.CreateScale(scale) *
                                 Matrix.CreateTranslation(translate);
-                renderer.Render(visual, null, transform);
+                renderer.Render(visual, null, transform, destinationRect);
 
                 var result = new BitmapBrush(brt, brt.Bitmap);
                 this.PlatformBrush = result;
diff --git a/tests/Perspex.RenderTests/Media/VisualBrushTests.cs b/tests/Perspex.RenderTests/Media/VisualBrushTests.cs
index 962ecf01a6..7d32014cc3 100644
--- a/tests/Perspex.RenderTests/Media/VisualBrushTests.cs
+++ b/tests/Perspex.RenderTests/Media/VisualBrushTests.cs
@@ -320,5 +320,43 @@ namespace Perspex.Direct2D1.RenderTests.Media
             this.RenderToFile(target);
             this.CompareImages();
         }
+
+        [Fact]
+        public void VisualBrush_SourceRect_DestinationRect_Absolute()
+        {
+            Decorator target = new Decorator
+            {
+                Padding = new Thickness(8),
+                Width = 200,
+                Height = 200,
+                Child = new Rectangle
+                {
+                    Fill = new VisualBrush
+                    {
+                        SourceRect = new RelativeRect(40, 40, 100, 100, OriginUnit.Pixels),
+                        DestinationRect = new RelativeRect(92, 92, 92, 92, OriginUnit.Pixels),
+                        Visual = new Border
+                        {
+                            Width = 180,
+                            Height = 180,
+                            Background = Brushes.Red,
+                            BorderBrush = Brushes.Black,
+                            BorderThickness = 2,
+                            Child = new Ellipse
+                            {
+                                Width = 100,
+                                Height = 100,
+                                Fill = Brushes.Yellow,
+                                VerticalAlignment = VerticalAlignment.Center,
+                                HorizontalAlignment = HorizontalAlignment.Center,
+                            }
+                        }
+                    }
+                }
+            };
+
+            this.RenderToFile(target);
+            this.CompareImages();
+        }
     }
 }
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_SourceRect_DestinationRect_Absolute.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_SourceRect_DestinationRect_Absolute.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2abed4041535e8c15d543fc4bca4951a4fccd9c
GIT binary patch
literal 2031
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
J)#MOP_%FKVk5T{t

literal 0
HcmV?d00001