From bf9d9e270b331c0bb026ed065bb972194c9bb27c Mon Sep 17 00:00:00 2001 From: Ivan Kochurkin Date: Mon, 25 Jan 2016 02:00:19 +0300 Subject: [PATCH] Added PolygonTests with evenOdd fill. Fixed errors after merge. --- .../Media/PathMarkupParser.cs | 2 +- .../Perspex.SceneGraph.csproj | 3 --- .../Shapes/PolygonTests.cs | 27 +++++++++++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/Perspex.SceneGraph/Media/PathMarkupParser.cs b/src/Perspex.SceneGraph/Media/PathMarkupParser.cs index 643ec3136a..b0da89e878 100644 --- a/src/Perspex.SceneGraph/Media/PathMarkupParser.cs +++ b/src/Perspex.SceneGraph/Media/PathMarkupParser.cs @@ -168,7 +168,7 @@ namespace Perspex.Media { Point point1 = ReadRelativePoint(reader, point); Point point2 = ReadRelativePoint(reader, point); - _context.BezierTo(point, point1, point2); + _context.CubicBezierTo(point, point1, point2); point = point2; break; } diff --git a/src/Perspex.SceneGraph/Perspex.SceneGraph.csproj b/src/Perspex.SceneGraph/Perspex.SceneGraph.csproj index 70c4c24647..1bfebfeb3f 100644 --- a/src/Perspex.SceneGraph/Perspex.SceneGraph.csproj +++ b/src/Perspex.SceneGraph/Perspex.SceneGraph.csproj @@ -106,9 +106,6 @@ - - - diff --git a/tests/Perspex.RenderTests/Shapes/PolygonTests.cs b/tests/Perspex.RenderTests/Shapes/PolygonTests.cs index 8e9c2cbb6e..284315a246 100644 --- a/tests/Perspex.RenderTests/Shapes/PolygonTests.cs +++ b/tests/Perspex.RenderTests/Shapes/PolygonTests.cs @@ -20,5 +20,32 @@ namespace Perspex.Direct2D1.RenderTests.Shapes : base(@"Shapes\Polygon") { } + + [Fact] + public void Polygon_1px_Stroke() + { + var polygonPoints = new Point[] { new Point(5, 0), new Point(8, 8), new Point(0, 3), new Point(10, 3), new Point(2, 8) }; + for (int i = 0; i < polygonPoints.Length; i++) + { + polygonPoints[i] = polygonPoints[i] * 15; + } + + Decorator target = new Decorator + { + Padding = new Thickness(8), + Width = 200, + Height = 150, + Child = new Polygon + { + Stroke = Brushes.DarkBlue, + Fill = Brushes.Violet, + Points = polygonPoints, + StrokeThickness = 1 + } + }; + + RenderToFile(target); + CompareImages(); + } } }