From 23b72840f3cb7c0c1771acdcc173375935bd92ca Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 30 Sep 2015 12:29:45 +0200
Subject: [PATCH] Fixed ClipToBounds not working.

It was clipping to the wrong bounds.
---
 .../Rendering/RendererBase.cs                 |   2 +-
 .../Shapes/RectangleTests.cs                  | Bin 4172 -> 5362 bytes
 ...ngle_Stroke_Fill_ClipToBounds.expected.png | Bin 0 -> 615 bytes
 ...ngle_Stroke_Fill_ClipToBounds.expected.png | Bin 0 -> 615 bytes
 4 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 tests/TestFiles/Cairo/Shapes/Rectangle/Rectangle_Stroke_Fill_ClipToBounds.expected.png
 create mode 100644 tests/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_Stroke_Fill_ClipToBounds.expected.png

diff --git a/src/Perspex.SceneGraph/Rendering/RendererBase.cs b/src/Perspex.SceneGraph/Rendering/RendererBase.cs
index 26e74dc6ad..26a5a9437a 100644
--- a/src/Perspex.SceneGraph/Rendering/RendererBase.cs
+++ b/src/Perspex.SceneGraph/Rendering/RendererBase.cs
@@ -101,7 +101,7 @@ namespace Perspex.Rendering
                 var d = context.PushTransform(m);
 
                 using (context.PushOpacity(opacity))
-                using (visual.ClipToBounds ? context.PushClip(visual.Bounds) : null)
+                using (visual.ClipToBounds ? context.PushClip(new Rect(visual.Bounds.Size)) : null)
                 {
                     visual.Render(context);
                     d.Dispose();
diff --git a/tests/Perspex.RenderTests/Shapes/RectangleTests.cs b/tests/Perspex.RenderTests/Shapes/RectangleTests.cs
index fc3dc26d466ab5d12839d8ce6a9f26ba23185743..f58297f7e811a2cf79f93346b1d589470223ce1e 100644
GIT binary patch
delta 103
zcmX@3@JVxng}@}9GVyo@XNDYxOojr65QcmPCm=3m$YV&Eyq;NlasZ#)<~2O0m?j&r
naVcX_#8Awjz+el+B@9JCZK;z5+0-Z7aUYtTz|Jw*L4XGUd<z+Q

delta 24
bcmeyQc}8J_g}~$lb`G9e23`g(1_%iNT*C!6

diff --git a/tests/TestFiles/Cairo/Shapes/Rectangle/Rectangle_Stroke_Fill_ClipToBounds.expected.png b/tests/TestFiles/Cairo/Shapes/Rectangle/Rectangle_Stroke_Fill_ClipToBounds.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1c13a9e57f842dc1c881f387fe80db1d00510c0
GIT binary patch
literal 615
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yF%}28J29*~C-V}>VM%xNb!1@J
z*w6hZk(GggNzl{9F{C2y?Nvj*!v;JojyM1R-+XC9L84C6lv6&%@(-H0ftnZ?9t2#^
zxw*MuQO<*TtZ_Ae9rp<OeX^*LXQ@*a;9zQ07$t^e7!;hHX3MR9imgTf9LWqntg~ww
XW_q#aDK0YH2NLph^>bP0l+XkKY#Dbw

literal 0
HcmV?d00001

diff --git a/tests/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_Stroke_Fill_ClipToBounds.expected.png b/tests/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_Stroke_Fill_ClipToBounds.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1c13a9e57f842dc1c881f387fe80db1d00510c0
GIT binary patch
literal 615
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yF%}28J29*~C-V}>VM%xNb!1@J
z*w6hZk(GggNzl{9F{C2y?Nvj*!v;JojyM1R-+XC9L84C6lv6&%@(-H0ftnZ?9t2#^
zxw*MuQO<*TtZ_Ae9rp<OeX^*LXQ@*a;9zQ07$t^e7!;hHX3MR9imgTf9LWqntg~ww
XW_q#aDK0YH2NLph^>bP0l+XkKY#Dbw

literal 0
HcmV?d00001