From 27a666467cc36d860790f8e3e9e04bebe78818a9 Mon Sep 17 00:00:00 2001
From: Benedikt Schroeder <benedikt.schroeder@outlook.de>
Date: Thu, 22 Mar 2018 11:31:54 +0100
Subject: [PATCH 1/6] Initial

---
 src/Avalonia.Controls/Border.cs               | 333 ++++++++++++++++--
 .../Presenters/ContentPresenter.cs            | 153 ++++----
 .../Primitives/TemplatedControl.cs            |   4 +-
 .../Accents/BaseLight.xaml                    |   5 +-
 src/Avalonia.Visuals/CornerRadius.cs          |  97 +++++
 src/Avalonia.Visuals/Thickness.cs             |   7 +-
 .../Avalonia.Markup.Xaml.csproj               |   1 +
 .../Converters/CornerRadiusTypeConverter.cs   |  19 +
 .../AvaloniaDefaultTypeConverters.cs          |   1 +
 .../Avalonia.Direct2D1/Media/GeometryImpl.cs  |  11 +-
 .../Styling/ApplyStyling.cs                   |   2 +-
 .../BorderTests.cs                            |   2 +-
 .../Controls/BorderTests.cs                   |  26 +-
 .../Media/VisualBrushTests.cs                 |   2 +-
 .../Avalonia.RenderTests/Shapes/PathTests.cs  |   2 +-
 .../Avalonia.Styling.UnitTests/StyleTests.cs  |   6 +-
 .../CornerRadiusTests.cs                      |  43 +++
 .../ThicknessTests.cs                         |   4 +-
 18 files changed, 582 insertions(+), 136 deletions(-)
 create mode 100644 src/Avalonia.Visuals/CornerRadius.cs
 create mode 100644 src/Markup/Avalonia.Markup.Xaml/Converters/CornerRadiusTypeConverter.cs
 create mode 100644 tests/Avalonia.Visuals.UnitTests/CornerRadiusTests.cs

diff --git a/src/Avalonia.Controls/Border.cs b/src/Avalonia.Controls/Border.cs
index 002c5ea3f2..4ddf81565a 100644
--- a/src/Avalonia.Controls/Border.cs
+++ b/src/Avalonia.Controls/Border.cs
@@ -1,6 +1,8 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
+using System;
+using Avalonia;
 using Avalonia.Media;
 
 namespace Avalonia.Controls
@@ -25,14 +27,16 @@ namespace Avalonia.Controls
         /// <summary>
         /// Defines the <see cref="BorderThickness"/> property.
         /// </summary>
-        public static readonly StyledProperty<double> BorderThicknessProperty =
-            AvaloniaProperty.Register<Border, double>(nameof(BorderThickness));
+        public static readonly StyledProperty<Thickness> BorderThicknessProperty =
+            AvaloniaProperty.Register<Border, Thickness>(nameof(BorderThickness));
 
         /// <summary>
         /// Defines the <see cref="CornerRadius"/> property.
         /// </summary>
-        public static readonly StyledProperty<float> CornerRadiusProperty =
-            AvaloniaProperty.Register<Border, float>(nameof(CornerRadius));
+        public static readonly StyledProperty<CornerRadius> CornerRadiusProperty =
+            AvaloniaProperty.Register<Border, CornerRadius>(nameof(CornerRadius));
+
+        private readonly BorderRenderer _borderRenderer = new BorderRenderer();
 
         /// <summary>
         /// Initializes static members of the <see cref="Border"/> class.
@@ -63,7 +67,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Gets or sets the thickness of the border.
         /// </summary>
-        public double BorderThickness
+        public Thickness BorderThickness
         {
             get { return GetValue(BorderThicknessProperty); }
             set { SetValue(BorderThicknessProperty, value); }
@@ -72,7 +76,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Gets or sets the radius of the border rounded corners.
         /// </summary>
-        public float CornerRadius
+        public CornerRadius CornerRadius
         {
             get { return GetValue(CornerRadiusProperty); }
             set { SetValue(CornerRadiusProperty, value); }
@@ -84,21 +88,7 @@ namespace Avalonia.Controls
         /// <param name="context">The drawing context.</param>
         public override void Render(DrawingContext context)
         {
-            var background = Background;
-            var borderBrush = BorderBrush;
-            var borderThickness = BorderThickness;
-            var cornerRadius = CornerRadius;
-            var rect = new Rect(Bounds.Size).Deflate(BorderThickness);
-
-            if (background != null)
-            {
-                context.FillRectangle(background, rect, cornerRadius);
-            }
-
-            if (borderBrush != null && borderThickness > 0)
-            {
-                context.DrawRectangle(new Pen(borderBrush, borderThickness), rect, cornerRadius);
-            }
+            _borderRenderer.Render(context, Bounds.Size, BorderThickness, CornerRadius, Background, BorderBrush);
         }
 
         /// <summary>
@@ -120,10 +110,12 @@ namespace Avalonia.Controls
         {
             if (Child != null)
             {
-                var padding = Padding + new Thickness(BorderThickness);
+                var padding = Padding + BorderThickness;
                 Child.Arrange(new Rect(finalSize).Deflate(padding));
             }
 
+            _borderRenderer.Update(finalSize, BorderThickness, CornerRadius);
+
             return finalSize;
         }
 
@@ -131,18 +123,307 @@ namespace Avalonia.Controls
             Size availableSize,
             IControl child,
             Thickness padding,
-            double borderThickness)
+            Thickness borderThickness)
         {
-            padding += new Thickness(borderThickness);
+            padding += borderThickness;
 
             if (child != null)
             {
                 child.Measure(availableSize.Deflate(padding));
                 return child.DesiredSize.Inflate(padding);
             }
-            else
+
+            return new Size(padding.Left + padding.Right, padding.Bottom + padding.Top);
+        }
+
+
+        internal class BorderRenderer
+        {
+            private bool _useComplexRendering;
+            private StreamGeometry _backgroundGeometryCache;
+            private StreamGeometry _borderGeometryCache;
+
+            public void Update(Size finalSize, Thickness borderThickness, CornerRadius cornerRadius)
+            {
+                if (borderThickness.IsUniform && cornerRadius.IsUniform)
+                {
+                    _backgroundGeometryCache = null;
+                    _borderGeometryCache = null;
+                    _useComplexRendering = false;
+                }
+                else
+                {
+                    _useComplexRendering = true;
+
+                    var boundRect = new Rect(finalSize);
+                    var innerRect = boundRect.Deflate(borderThickness);
+                    var innerRadii = new Radii(cornerRadius, borderThickness, false);
+
+                    StreamGeometry backgroundGeometry = null;
+
+                    //  calculate border / background rendering geometry
+                    if (!innerRect.Width.Equals(0) && !innerRect.Height.Equals(0))
+                    {
+                        backgroundGeometry = new StreamGeometry();
+
+                        using (var ctx = backgroundGeometry.Open())
+                        {
+                            GenerateGeometry(ctx, innerRect, innerRadii);
+                        }
+
+                        _backgroundGeometryCache = backgroundGeometry;
+                    }
+                    else
+                    {
+                        _backgroundGeometryCache = null;
+                    }
+
+                    if (!boundRect.Width.Equals(0) && !boundRect.Height.Equals(0))
+                    {
+                        var outerRadii = new Radii(cornerRadius, borderThickness, true);
+                        var borderGeometry = new StreamGeometry();
+
+                        using (var ctx = borderGeometry.Open())
+                        {
+                            GenerateGeometry(ctx, boundRect, outerRadii);
+
+                            if (backgroundGeometry != null)
+                            {
+                                GenerateGeometry(ctx, innerRect, innerRadii);
+                            }
+                        }
+
+                        _borderGeometryCache = borderGeometry;
+                    }
+                    else
+                    {
+                        _borderGeometryCache = null;
+                    }
+                }
+            }
+
+            public void Render(DrawingContext context, Size size, Thickness borders, CornerRadius radii, IBrush background, IBrush borderBrush)
             {
-                return new Size(padding.Left + padding.Right, padding.Bottom + padding.Top);
+                if (_useComplexRendering)
+                {
+                    IBrush brush;
+                    var borderGeometry = _borderGeometryCache;
+                    if (borderGeometry != null && (brush = borderBrush) != null)
+                    {
+                        context.DrawGeometry(brush, null, borderGeometry);
+                    }
+
+                    var backgroundGeometry = _backgroundGeometryCache;
+                    if (backgroundGeometry != null && (brush = background) != null)
+                    {
+                        context.DrawGeometry(brush, null, backgroundGeometry);
+                    }
+                }
+                else
+                {
+                    var borderThickness = borders.Left;
+                    var cornerRadius = (float)radii.TopLeft;
+                    var rect = new Rect(size);
+
+                    if (background != null)
+                    {
+                        context.FillRectangle(background, rect.Deflate(borders), cornerRadius);
+                    }
+
+                    if (borderBrush != null && borderThickness > 0)
+                    {
+                        context.DrawRectangle(new Pen(borderBrush, borderThickness), rect.Deflate(borderThickness), cornerRadius);
+                    }
+                }
+            }
+
+            private static void GenerateGeometry(StreamGeometryContext ctx, Rect rect, Radii radii)
+            {
+                //
+                //  Compute the coordinates of the key points
+                //
+
+                var topLeft = new Point(radii.LeftTop, 0);
+                var topRight = new Point(rect.Width - radii.RightTop, 0);
+                var rightTop = new Point(rect.Width, radii.TopRight);
+                var rightBottom = new Point(rect.Width, rect.Height - radii.BottomRight);
+                var bottomRight = new Point(rect.Width - radii.RightBottom, rect.Height);
+                var bottomLeft = new Point(radii.LeftBottom, rect.Height);
+                var leftBottom = new Point(0, rect.Height - radii.BottomLeft);
+                var leftTop = new Point(0, radii.TopLeft);
+
+                //
+                //  Check keypoints for overlap and resolve by partitioning radii according to
+                //  the percentage of each one.  
+                //
+
+                //  Top edge is handled here
+                if (topLeft.X > topRight.X)
+                {
+                    var x = radii.LeftTop / (radii.LeftTop + radii.RightTop) * rect.Width;
+                    topLeft += new Point(x, 0);
+                    topRight += new Point(x, 0);
+                }
+
+                //  Right edge
+                if (rightTop.Y > rightBottom.Y)
+                {
+                    var y = radii.TopRight / (radii.TopRight + radii.BottomRight) * rect.Height;
+                    rightTop += new Point(0, y);
+                    rightBottom += new Point(0, y);
+                }
+
+                //  Bottom edge
+                if (bottomRight.X < bottomLeft.X)
+                {
+                    var x = radii.LeftBottom / (radii.LeftBottom + radii.RightBottom) * rect.Width;
+                    bottomRight += new Point(x, 0);
+                    bottomLeft += new Point(x, 0);
+                }
+
+                // Left edge
+                if (leftBottom.Y < leftTop.Y)
+                {
+                    var y = radii.TopLeft / (radii.TopLeft + radii.BottomLeft) * rect.Height;
+                    leftBottom += new Point(0, y);
+                    leftTop += new Point(0, y);
+                }
+
+                //
+                //  Add on offsets
+                //
+
+                var offset = new Vector(rect.TopLeft.X, rect.TopLeft.Y);
+                topLeft += offset;
+                topRight += offset;
+                rightTop += offset;
+                rightBottom += offset;
+                bottomRight += offset;
+                bottomLeft += offset;
+                leftBottom += offset;
+                leftTop += offset;
+
+                //
+                //  Create the border geometry
+                //
+                ctx.BeginFigure(topLeft, true);
+
+                // Top
+                ctx.LineTo(topRight);
+
+                // TopRight
+                var radiusX = rect.TopRight.X - topRight.X;
+                var radiusY = rightTop.Y - rect.TopRight.Y;
+                if (!radiusX.Equals(0) || !radiusY.Equals(0))
+                {
+                    ctx.ArcTo(rightTop, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise);
+                }
+
+                // Right
+                ctx.LineTo(rightBottom);
+
+                // BottomRight
+                radiusX = rect.BottomRight.X - bottomRight.X;
+                radiusY = rect.BottomRight.Y - rightBottom.Y;
+                if (!radiusX.Equals(0) || !radiusY.Equals(0))
+                {
+                    ctx.ArcTo(bottomRight, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise);
+                }
+
+                // Bottom
+                ctx.LineTo(bottomLeft);
+
+                // BottomLeft
+                radiusX = bottomLeft.X - rect.BottomLeft.X;
+                radiusY = rect.BottomLeft.Y - leftBottom.Y;
+                if (!radiusX.Equals(0) || !radiusY.Equals(0))
+                {
+                    ctx.ArcTo(leftBottom, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise);
+                }
+
+                // Left
+                ctx.LineTo(leftTop);
+
+                // TopLeft
+                radiusX = topLeft.X - rect.TopLeft.X;
+                radiusY = leftTop.Y - rect.TopLeft.Y;
+                if (!radiusX.Equals(0) || !radiusY.Equals(0))
+                {
+                    ctx.ArcTo(topLeft, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise);
+                }
+
+                ctx.EndFigure(true);
+            }
+
+            private struct Radii
+            {
+                internal Radii(CornerRadius radii, Thickness borders, bool outer)
+                {
+                    var left = 0.5 * borders.Left;
+                    var top = 0.5 * borders.Top;
+                    var right = 0.5 * borders.Right;
+                    var bottom = 0.5 * borders.Bottom;
+
+                    if (outer)
+                    {
+                        if (radii.TopLeft.Equals(0))
+                        {
+                            LeftTop = TopLeft = 0.0;
+                        }
+                        else
+                        {
+                            LeftTop = radii.TopLeft + left;
+                            TopLeft = radii.TopLeft + top;
+                        }
+                        if (radii.TopRight.Equals(0))
+                        {
+                            TopRight = RightTop = 0.0;
+                        }
+                        else
+                        {
+                            TopRight = radii.TopRight + top;
+                            RightTop = radii.TopRight + right;
+                        }
+                        if (radii.BottomRight.Equals(0))
+                        {
+                            RightBottom = BottomRight = 0.0;
+                        }
+                        else
+                        {
+                            RightBottom = radii.BottomRight + right;
+                            BottomRight = radii.BottomRight + bottom;
+                        }
+                        if (radii.BottomLeft.Equals(0))
+                        {
+                            BottomLeft = LeftBottom = 0.0;
+                        }
+                        else
+                        {
+                            BottomLeft = radii.BottomLeft + bottom;
+                            LeftBottom = radii.BottomLeft + left;
+                        }
+                    }
+                    else
+                    {
+                        LeftTop = Math.Max(0.0, radii.TopLeft - left);
+                        TopLeft = Math.Max(0.0, radii.TopLeft - top);
+                        TopRight = Math.Max(0.0, radii.TopRight - top);
+                        RightTop = Math.Max(0.0, radii.TopRight - right);
+                        RightBottom = Math.Max(0.0, radii.BottomRight - right);
+                        BottomRight = Math.Max(0.0, radii.BottomRight - bottom);
+                        BottomLeft = Math.Max(0.0, radii.BottomLeft - bottom);
+                        LeftBottom = Math.Max(0.0, radii.BottomLeft - left);
+                    }
+                }
+
+                internal readonly double LeftTop;
+                internal readonly double TopLeft;
+                internal readonly double TopRight;
+                internal readonly double RightTop;
+                internal readonly double RightBottom;
+                internal readonly double BottomRight;
+                internal readonly double BottomLeft;
+                internal readonly double LeftBottom;
             }
         }
     }
diff --git a/src/Avalonia.Controls/Presenters/ContentPresenter.cs b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
index d0a438cc2b..2d623dcbf7 100644
--- a/src/Avalonia.Controls/Presenters/ContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
@@ -31,7 +31,7 @@ namespace Avalonia.Controls.Presenters
         /// <summary>
         /// Defines the <see cref="BorderThickness"/> property.
         /// </summary>
-        public static readonly StyledProperty<double> BorderThicknessProperty =
+        public static readonly StyledProperty<Thickness> BorderThicknessProperty =
             Border.BorderThicknessProperty.AddOwner<ContentPresenter>();
 
         /// <summary>
@@ -57,7 +57,7 @@ namespace Avalonia.Controls.Presenters
         /// <summary>
         /// Defines the <see cref="CornerRadius"/> property.
         /// </summary>
-        public static readonly StyledProperty<float> CornerRadiusProperty =
+        public static readonly StyledProperty<CornerRadius> CornerRadiusProperty =
             Border.CornerRadiusProperty.AddOwner<ContentPresenter>();
 
         /// <summary>
@@ -81,6 +81,7 @@ namespace Avalonia.Controls.Presenters
         private IControl _child;
         private bool _createdChild;
         private IDataTemplate _dataTemplate;
+        private readonly Border.BorderRenderer _borderRenderer = new Border.BorderRenderer();
 
         /// <summary>
         /// Initializes static members of the <see cref="ContentPresenter"/> class.
@@ -120,7 +121,7 @@ namespace Avalonia.Controls.Presenters
         /// <summary>
         /// Gets or sets the thickness of the border.
         /// </summary>
-        public double BorderThickness
+        public Thickness BorderThickness
         {
             get { return GetValue(BorderThicknessProperty); }
             set { SetValue(BorderThicknessProperty, value); }
@@ -157,7 +158,7 @@ namespace Avalonia.Controls.Presenters
         /// <summary>
         /// Gets or sets the radius of the border rounded corners.
         /// </summary>
-        public float CornerRadius
+        public CornerRadius CornerRadius
         {
             get { return GetValue(CornerRadiusProperty); }
             set { SetValue(CornerRadiusProperty, value); }
@@ -221,7 +222,7 @@ namespace Avalonia.Controls.Presenters
         {
             var content = Content;
             var oldChild = Child;
-            var newChild = CreateChild();            
+            var newChild = CreateChild();
 
             // Remove the old child if we're not recycling it.
             if (oldChild != null && newChild != oldChild)
@@ -277,21 +278,7 @@ namespace Avalonia.Controls.Presenters
         /// <inheritdoc/>
         public override void Render(DrawingContext context)
         {
-            var background = Background;
-            var borderBrush = BorderBrush;
-            var borderThickness = BorderThickness;
-            var cornerRadius = CornerRadius;
-            var rect = new Rect(Bounds.Size).Deflate(BorderThickness);
-
-            if (background != null)
-            {
-                context.FillRectangle(background, rect, cornerRadius);
-            }
-
-            if (borderBrush != null && borderThickness > 0)
-            {
-                context.DrawRectangle(new Pen(borderBrush, borderThickness), rect, cornerRadius);
-            }
+            _borderRenderer.Render(context, Bounds.Size, BorderThickness, CornerRadius, Background, BorderBrush);
         }
 
         /// <summary>
@@ -344,7 +331,11 @@ namespace Avalonia.Controls.Presenters
         /// <inheritdoc/>
         protected override Size ArrangeOverride(Size finalSize)
         {
-            return ArrangeOverrideImpl(finalSize, new Vector());
+            finalSize = ArrangeOverrideImpl(finalSize, new Vector());
+
+            _borderRenderer.Update(finalSize, BorderThickness, CornerRadius);
+
+            return finalSize;
         }
 
         /// <summary>
@@ -372,74 +363,74 @@ namespace Avalonia.Controls.Presenters
 
         internal Size ArrangeOverrideImpl(Size finalSize, Vector offset)
         {
-            if (Child != null)
-            {
-                var padding = Padding;
-                var borderThickness = BorderThickness;
-                var horizontalContentAlignment = HorizontalContentAlignment;
-                var verticalContentAlignment = VerticalContentAlignment;
-                var useLayoutRounding = UseLayoutRounding;
-                var availableSizeMinusMargins = new Size(
-                    Math.Max(0, finalSize.Width - padding.Left - padding.Right - borderThickness),
-                    Math.Max(0, finalSize.Height - padding.Top - padding.Bottom - borderThickness));
-                var size = availableSizeMinusMargins;
-                var scale = GetLayoutScale();
-                var originX = offset.X + padding.Left + borderThickness;
-                var originY = offset.Y + padding.Top + borderThickness;
-
-                if (horizontalContentAlignment != HorizontalAlignment.Stretch)
-                {
-                    size = size.WithWidth(Math.Min(size.Width, DesiredSize.Width - padding.Left - padding.Right));
-                }
+            if (Child == null) return finalSize;
 
-                if (verticalContentAlignment != VerticalAlignment.Stretch)
-                {
-                    size = size.WithHeight(Math.Min(size.Height, DesiredSize.Height - padding.Top - padding.Bottom));
-                }
+            var padding = Padding;
+            var borderThickness = BorderThickness;
+            var horizontalContentAlignment = HorizontalContentAlignment;
+            var verticalContentAlignment = VerticalContentAlignment;
+            var useLayoutRounding = UseLayoutRounding;
+            //Not sure about this part
+            var availableSizeMinusMargins = new Size(
+                Math.Max(0, finalSize.Width - padding.Left - padding.Right - borderThickness.Left - borderThickness.Right),
+                Math.Max(0, finalSize.Height - padding.Top - padding.Bottom - borderThickness.Top - borderThickness.Bottom));
+            var size = availableSizeMinusMargins;
+            var scale = GetLayoutScale();
+            var originX = offset.X + padding.Left + borderThickness.Left;
+            var originY = offset.Y + padding.Top + borderThickness.Top;
+
+            if (horizontalContentAlignment != HorizontalAlignment.Stretch)
+            {
+                size = size.WithWidth(Math.Min(size.Width, DesiredSize.Width - padding.Left - padding.Right));
+            }
 
-                size = LayoutHelper.ApplyLayoutConstraints(Child, size);
+            if (verticalContentAlignment != VerticalAlignment.Stretch)
+            {
+                size = size.WithHeight(Math.Min(size.Height, DesiredSize.Height - padding.Top - padding.Bottom));
+            }
 
-                if (useLayoutRounding)
-                {
-                    size = new Size(
-                        Math.Ceiling(size.Width * scale) / scale,
-                        Math.Ceiling(size.Height * scale) / scale);
-                    availableSizeMinusMargins = new Size(
-                        Math.Ceiling(availableSizeMinusMargins.Width * scale) / scale,
-                        Math.Ceiling(availableSizeMinusMargins.Height * scale) / scale);
-                }
+            size = LayoutHelper.ApplyLayoutConstraints(Child, size);
 
-                switch (horizontalContentAlignment)
-                {
-                    case HorizontalAlignment.Center:
-                    case HorizontalAlignment.Stretch:
-                        originX += (availableSizeMinusMargins.Width - size.Width) / 2;
-                        break;
-                    case HorizontalAlignment.Right:
-                        originX += availableSizeMinusMargins.Width - size.Width;
-                        break;
-                }
+            if (useLayoutRounding)
+            {
+                size = new Size(
+                    Math.Ceiling(size.Width * scale) / scale,
+                    Math.Ceiling(size.Height * scale) / scale);
+                availableSizeMinusMargins = new Size(
+                    Math.Ceiling(availableSizeMinusMargins.Width * scale) / scale,
+                    Math.Ceiling(availableSizeMinusMargins.Height * scale) / scale);
+            }
 
-                switch (verticalContentAlignment)
-                {
-                    case VerticalAlignment.Center:
-                    case VerticalAlignment.Stretch:
-                        originY += (availableSizeMinusMargins.Height - size.Height) / 2;
-                        break;
-                    case VerticalAlignment.Bottom:
-                        originY += availableSizeMinusMargins.Height - size.Height;
-                        break;
-                }
+            switch (horizontalContentAlignment)
+            {
+                case HorizontalAlignment.Center:
+                case HorizontalAlignment.Stretch:
+                    originX += (availableSizeMinusMargins.Width - size.Width) / 2;
+                    break;
+                case HorizontalAlignment.Right:
+                    originX += availableSizeMinusMargins.Width - size.Width;
+                    break;
+            }
 
-                if (useLayoutRounding)
-                {
-                    originX = Math.Floor(originX * scale) / scale;
-                    originY = Math.Floor(originY * scale) / scale;
-                }
+            switch (verticalContentAlignment)
+            {
+                case VerticalAlignment.Center:
+                case VerticalAlignment.Stretch:
+                    originY += (availableSizeMinusMargins.Height - size.Height) / 2;
+                    break;
+                case VerticalAlignment.Bottom:
+                    originY += availableSizeMinusMargins.Height - size.Height;
+                    break;
+            }
 
-                Child.Arrange(new Rect(originX, originY, size.Width, size.Height));
+            if (useLayoutRounding)
+            {
+                originX = Math.Floor(originX * scale) / scale;
+                originY = Math.Floor(originY * scale) / scale;
             }
 
+            Child.Arrange(new Rect(originX, originY, size.Width, size.Height));
+
             return finalSize;
         }
 
@@ -447,7 +438,7 @@ namespace Avalonia.Controls.Presenters
         {
             var result = (VisualRoot as ILayoutRoot)?.LayoutScaling ?? 1.0;
 
-            if (result == 0 || double.IsNaN(result) || double.IsInfinity(result))
+            if (result.Equals(0) || double.IsNaN(result) || double.IsInfinity(result))
             {
                 throw new Exception($"Invalid LayoutScaling returned from {VisualRoot.GetType()}");
             }
diff --git a/src/Avalonia.Controls/Primitives/TemplatedControl.cs b/src/Avalonia.Controls/Primitives/TemplatedControl.cs
index 6deef7c7b9..77735f3f12 100644
--- a/src/Avalonia.Controls/Primitives/TemplatedControl.cs
+++ b/src/Avalonia.Controls/Primitives/TemplatedControl.cs
@@ -32,7 +32,7 @@ namespace Avalonia.Controls.Primitives
         /// <summary>
         /// Defines the <see cref="BorderThickness"/> property.
         /// </summary>
-        public static readonly StyledProperty<double> BorderThicknessProperty =
+        public static readonly StyledProperty<Thickness> BorderThicknessProperty =
             Border.BorderThicknessProperty.AddOwner<TemplatedControl>();
 
         /// <summary>
@@ -132,7 +132,7 @@ namespace Avalonia.Controls.Primitives
         /// <summary>
         /// Gets or sets the thickness of the control's border.
         /// </summary>
-        public double BorderThickness
+        public Thickness BorderThickness
         {
             get { return GetValue(BorderThicknessProperty); }
             set { SetValue(BorderThicknessProperty, value); }
diff --git a/src/Avalonia.Themes.Default/Accents/BaseLight.xaml b/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
index cb86598a42..ebb14579b4 100644
--- a/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
+++ b/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
@@ -1,6 +1,7 @@
 <Style xmlns="https://github.com/avaloniaui"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       xmlns:sys="clr-namespace:System;assembly=mscorlib">
+       xmlns:sys="clr-namespace:System;assembly=mscorlib"
+       xmlns:avalonia="clr-namespace:Avalonia;assembly=Avalonia.Visuals">
   <Style.Resources>
     <SolidColorBrush x:Key="ThemeBackgroundBrush">#FFFFFFFF</SolidColorBrush>
     <SolidColorBrush x:Key="ThemeBorderLightBrush">#FFAAAAAA</SolidColorBrush>
@@ -20,7 +21,7 @@
     <SolidColorBrush x:Key="ErrorBrush">Red</SolidColorBrush>
     <SolidColorBrush x:Key="ErrorBrushLight">#10ff0000</SolidColorBrush>
 
-    <sys:Double x:Key="ThemeBorderThickness">2</sys:Double>
+    <avalonia:Thickness x:Key="ThemeBorderThickness">2</avalonia:Thickness>
     <sys:Double x:Key="ThemeDisabledOpacity">0.5</sys:Double>
 
     <sys:Double x:Key="FontSizeSmall">10</sys:Double>
diff --git a/src/Avalonia.Visuals/CornerRadius.cs b/src/Avalonia.Visuals/CornerRadius.cs
new file mode 100644
index 0000000000..25e3b103cd
--- /dev/null
+++ b/src/Avalonia.Visuals/CornerRadius.cs
@@ -0,0 +1,97 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Globalization;
+using System.Linq;
+
+namespace Avalonia
+{
+    public struct CornerRadius
+    {
+        public CornerRadius(double uniformRadius)
+        {
+            TopLeft = TopRight = BottomLeft = BottomRight = uniformRadius;
+
+        }
+        public CornerRadius(double top, double bottom)
+        {
+            TopLeft = TopRight = top;
+            BottomLeft = BottomRight = bottom;
+        }
+        public CornerRadius(double topLeft, double topRight, double bottomRight, double bottomLeft)
+        {
+            TopLeft = topLeft;
+            TopRight = topRight;
+            BottomRight = bottomRight;
+            BottomLeft = bottomLeft;
+        }
+
+        public double TopLeft { get; }
+        public double TopRight { get; }
+        public double BottomRight { get; }
+        public double BottomLeft { get; }
+        public bool IsEmpty => TopLeft.Equals(0) && IsUniform;
+        public bool IsUniform => TopLeft.Equals(TopRight) && BottomLeft.Equals(BottomRight) && TopRight.Equals(BottomRight);
+
+        public override bool Equals(object obj)
+        {
+            if (obj is CornerRadius)
+            {
+                return this == (CornerRadius)obj;
+            }
+            return false;
+        }
+
+        public override int GetHashCode()
+        {
+            return TopLeft.GetHashCode() ^ TopRight.GetHashCode() ^ BottomLeft.GetHashCode() ^ BottomRight.GetHashCode();
+        }
+
+        public override string ToString()
+        {
+            return $"{TopLeft},{TopRight},{BottomRight},{BottomLeft}";
+        }
+
+        public static CornerRadius Parse(string s, CultureInfo culture)
+        {
+            var parts = s.Split(new[] { ',', ' ' }, StringSplitOptions.RemoveEmptyEntries)
+                .Select(x => x.Trim())
+                .ToList();
+
+            switch (parts.Count)
+            {
+                case 1:
+                    var uniform = double.Parse(parts[0], culture);
+                    return new CornerRadius(uniform);
+                case 2:
+                    var top = double.Parse(parts[0], culture);
+                    var bottom = double.Parse(parts[1], culture);
+                    return new CornerRadius(top, bottom);
+                case 4:
+                    var topLeft = double.Parse(parts[0], culture);
+                    var topRight = double.Parse(parts[1], culture);
+                    var bottomRight = double.Parse(parts[2], culture);
+                    var bottomLeft = double.Parse(parts[3], culture);
+                    return new CornerRadius(topLeft, topRight, bottomRight, bottomLeft);
+                default:
+                    {
+                        throw new FormatException("Invalid CornerRadius.");
+                    }
+            }
+        }
+
+        public static bool operator ==(CornerRadius cr1, CornerRadius cr2)
+        {
+            return ((cr1.TopLeft.Equals(cr2.TopLeft) || double.IsNaN(cr1.TopLeft) && double.IsNaN(cr2.TopLeft)))
+                   && (cr1.TopRight.Equals(cr2.TopRight) || (double.IsNaN(cr1.TopRight) && double.IsNaN(cr2.TopRight)))
+                   && (cr1.BottomRight.Equals(cr2.BottomRight) || double.IsNaN(cr1.BottomRight) && double.IsNaN(cr2.BottomRight))
+                   && (cr1.BottomLeft.Equals(cr2.BottomLeft) || double.IsNaN(cr1.BottomLeft) && double.IsNaN(cr2.BottomLeft));
+        }
+
+        public static bool operator !=(CornerRadius cr1, CornerRadius cr2)
+        {
+            return (!(cr1 == cr2));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Visuals/Thickness.cs b/src/Avalonia.Visuals/Thickness.cs
index dc9be7341d..ead9fd004a 100644
--- a/src/Avalonia.Visuals/Thickness.cs
+++ b/src/Avalonia.Visuals/Thickness.cs
@@ -90,7 +90,12 @@ namespace Avalonia
         /// <summary>
         /// Gets a value indicating whether all sides are set to 0.
         /// </summary>
-        public bool IsEmpty => Left == 0 && Top == 0 && Right == 0 && Bottom == 0;
+        public bool IsEmpty => Left.Equals(0) && IsUniform;
+
+        /// <summary>
+        /// Gets a value indicating whether all sides are equal.
+        /// </summary>
+        public bool IsUniform => Left.Equals(Right) && Top.Equals(Bottom) && Right.Equals(Bottom);
 
         /// <summary>
         /// Compares two Thicknesses.
diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
index 0ce2a1a992..bd6acfdad1 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
+++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
@@ -31,6 +31,7 @@
         </Compile>
         <Compile Include="AvaloniaXamlLoaderPortableXaml.cs" />
         <Compile Include="AvaloniaXamlLoader.cs" />
+        <Compile Include="Converters\CornerRadiusTypeConverter.cs" />
         <Compile Include="Converters\MatrixTypeConverter.cs" />
         <Compile Include="Converters\RectTypeConverter.cs" />
         <Compile Include="Converters\SetterValueTypeConverter.cs" />
diff --git a/src/Markup/Avalonia.Markup.Xaml/Converters/CornerRadiusTypeConverter.cs b/src/Markup/Avalonia.Markup.Xaml/Converters/CornerRadiusTypeConverter.cs
new file mode 100644
index 0000000000..5da0efae1b
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml/Converters/CornerRadiusTypeConverter.cs
@@ -0,0 +1,19 @@
+using System;
+using System.ComponentModel;
+using System.Globalization;
+
+namespace Avalonia.Markup.Xaml.Converters
+{
+    public class CornerRadiusTypeConverter : TypeConverter
+    {
+        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+        {
+            return sourceType == typeof(string);
+        }
+
+        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            return CornerRadius.Parse((string)value, culture);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaDefaultTypeConverters.cs b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaDefaultTypeConverters.cs
index 1cf5b6a58e..1ae24c8a34 100644
--- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaDefaultTypeConverters.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaDefaultTypeConverters.cs
@@ -43,6 +43,7 @@ namespace Avalonia.Markup.Xaml.PortableXaml
             { typeof(Selector), typeof(SelectorTypeConverter)},
             { typeof(SolidColorBrush), typeof(BrushTypeConverter) },
             { typeof(Thickness), typeof(ThicknessTypeConverter) },
+            { typeof(CornerRadius), typeof(CornerRadiusTypeConverter) },
             { typeof(TimeSpan), typeof(TimeSpanTypeConverter) },
             //{ typeof(Uri), typeof(Converters.UriTypeConverter) },
             { typeof(Cursor), typeof(CursorTypeConverter) },
diff --git a/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
index 8f11d1463b..4b0bb4d7f9 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
@@ -26,8 +26,15 @@ namespace Avalonia.Direct2D1.Media
         /// <inheritdoc/>
         public Rect GetRenderBounds(Avalonia.Media.Pen pen)
         {
-            var factory = AvaloniaLocator.Current.GetService<Factory>();
-            return Geometry.GetWidenedBounds((float)pen.Thickness).ToAvalonia();
+            //var factory = AvaloniaLocator.Current.GetService<Factory>();
+            if (pen == null)
+            {
+                return Geometry.GetWidenedBounds(0).ToAvalonia();
+            }
+            else
+            {
+                return Geometry.GetWidenedBounds((float)pen.Thickness).ToAvalonia();
+            }
         }
 
         /// <inheritdoc/>
diff --git a/tests/Avalonia.Benchmarks/Styling/ApplyStyling.cs b/tests/Avalonia.Benchmarks/Styling/ApplyStyling.cs
index 33af55fdf9..d24a646f74 100644
--- a/tests/Avalonia.Benchmarks/Styling/ApplyStyling.cs
+++ b/tests/Avalonia.Benchmarks/Styling/ApplyStyling.cs
@@ -33,7 +33,7 @@ namespace Avalonia.Benchmarks.Styling
 
             var border = (Border)textBox.GetVisualChildren().Single();
 
-            if (border.BorderThickness != 2)
+            if (border.BorderThickness != new Thickness(2))
             {
                 throw new Exception("Styles not applied.");
             }
diff --git a/tests/Avalonia.Controls.UnitTests/BorderTests.cs b/tests/Avalonia.Controls.UnitTests/BorderTests.cs
index c0d2a39ab2..3660a7b4ca 100644
--- a/tests/Avalonia.Controls.UnitTests/BorderTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/BorderTests.cs
@@ -13,7 +13,7 @@ namespace Avalonia.Controls.UnitTests
             var target = new Border
             {
                 Padding = new Thickness(6),
-                BorderThickness = 4,
+                BorderThickness = new Thickness(4)
             };
 
             target.Measure(new Size(100, 100));
diff --git a/tests/Avalonia.RenderTests/Controls/BorderTests.cs b/tests/Avalonia.RenderTests/Controls/BorderTests.cs
index 3bd5a6e1cb..411870785a 100644
--- a/tests/Avalonia.RenderTests/Controls/BorderTests.cs
+++ b/tests/Avalonia.RenderTests/Controls/BorderTests.cs
@@ -31,7 +31,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                 Child = new Border
                 {
                     BorderBrush = Brushes.Black,
-                    BorderThickness = 1,
+                    BorderThickness = new Thickness(1),
                 }
             };
 
@@ -50,7 +50,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                 Child = new Border
                 {
                     BorderBrush = Brushes.Black,
-                    BorderThickness = 2,
+                    BorderThickness = new Thickness(2),
                 }
             };
 
@@ -87,7 +87,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                 Child = new Border
                 {
                     BorderBrush = Brushes.Black,
-                    BorderThickness = 2,
+                    BorderThickness = new Thickness(2),
                     Child = new Border
                     {
                         Background = Brushes.Red,
@@ -110,7 +110,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                 Child = new Border
                 {
                     BorderBrush = Brushes.Black,
-                    BorderThickness = 2,
+                    BorderThickness = new Thickness(2),
                     Padding = new Thickness(2),
                     Child = new Border
                     {
@@ -134,7 +134,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                 Child = new Border
                 {
                     BorderBrush = Brushes.Black,
-                    BorderThickness = 2,
+                    BorderThickness = new Thickness(2),
                     Child = new Border
                     {
                         Background = Brushes.Red,
@@ -159,7 +159,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                 Child = new Border
                 {
                     BorderBrush = Brushes.Black,
-                    BorderThickness = 2,
+                    BorderThickness = new Thickness(2),
                     Child = new TextBlock
                     {
                         Text = "Foo",
@@ -186,7 +186,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                 Child = new Border
                 {
                     BorderBrush = Brushes.Black,
-                    BorderThickness = 2,
+                    BorderThickness = new Thickness(2),
                     Child = new TextBlock
                     {
                         Text = "Foo",
@@ -213,7 +213,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                 Child = new Border
                 {
                     BorderBrush = Brushes.Black,
-                    BorderThickness = 2,
+                    BorderThickness = new Thickness(2),
                     Child = new TextBlock
                     {
                         Text = "Foo",
@@ -240,7 +240,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                 Child = new Border
                 {
                     BorderBrush = Brushes.Black,
-                    BorderThickness = 2,
+                    BorderThickness = new Thickness(2),
                     Child = new TextBlock
                     {
                         Text = "Foo",
@@ -267,7 +267,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                 Child = new Border
                 {
                     BorderBrush = Brushes.Black,
-                    BorderThickness = 2,
+                    BorderThickness = new Thickness(2),
                     Child = new TextBlock
                     {
                         Text = "Foo",
@@ -294,7 +294,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                 Child = new Border
                 {
                     BorderBrush = Brushes.Black,
-                    BorderThickness = 2,
+                    BorderThickness = new Thickness(2),
                     Child = new TextBlock
                     {
                         Text = "Foo",
@@ -321,7 +321,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                 Child = new Border
                 {
                     BorderBrush = Brushes.Black,
-                    BorderThickness = 2,
+                    BorderThickness = new Thickness(2),
                     Child = new TextBlock
                     {
                         Text = "Foo",
@@ -348,7 +348,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                 Child = new Border
                 {
                     BorderBrush = Brushes.Black,
-                    BorderThickness = 2,
+                    BorderThickness = new Thickness(2),
                     Child = new TextBlock
                     {
                         Text = "Foo",
diff --git a/tests/Avalonia.RenderTests/Media/VisualBrushTests.cs b/tests/Avalonia.RenderTests/Media/VisualBrushTests.cs
index 099b022862..cfa15ae304 100644
--- a/tests/Avalonia.RenderTests/Media/VisualBrushTests.cs
+++ b/tests/Avalonia.RenderTests/Media/VisualBrushTests.cs
@@ -42,7 +42,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
                         new Border
                         {
                             BorderBrush = Brushes.Blue,
-                            BorderThickness = 2,
+                            BorderThickness = new Thickness(2),
                             HorizontalAlignment = HorizontalAlignment.Center,
                             VerticalAlignment = VerticalAlignment.Center,
                             Child = new TextBlock
diff --git a/tests/Avalonia.RenderTests/Shapes/PathTests.cs b/tests/Avalonia.RenderTests/Shapes/PathTests.cs
index fab867f428..4703daca25 100644
--- a/tests/Avalonia.RenderTests/Shapes/PathTests.cs
+++ b/tests/Avalonia.RenderTests/Shapes/PathTests.cs
@@ -316,7 +316,7 @@ namespace Avalonia.Direct2D1.RenderTests.Shapes
                 Child = new Border
                 {
                     BorderBrush = Brushes.Red,
-                    BorderThickness = 1,
+                    BorderThickness = new Thickness(1),
                     HorizontalAlignment = HorizontalAlignment.Center,
                     VerticalAlignment = VerticalAlignment.Center,
                     Child = new Path
diff --git a/tests/Avalonia.Styling.UnitTests/StyleTests.cs b/tests/Avalonia.Styling.UnitTests/StyleTests.cs
index a7c559668b..5ef559b887 100644
--- a/tests/Avalonia.Styling.UnitTests/StyleTests.cs
+++ b/tests/Avalonia.Styling.UnitTests/StyleTests.cs
@@ -151,7 +151,7 @@ namespace Avalonia.Styling.UnitTests
             {
                 Setters = new[]
                 {
-                    new Setter(Border.BorderThicknessProperty, 4),
+                    new Setter(Border.BorderThicknessProperty, new Thickness(4)),
                 }
             };
 
@@ -162,9 +162,9 @@ namespace Avalonia.Styling.UnitTests
 
             style.Attach(border, null);
 
-            Assert.Equal(4, border.BorderThickness);
+            Assert.Equal(new Thickness(4), border.BorderThickness);
             root.Child = null;
-            Assert.Equal(0, border.BorderThickness);
+            Assert.Equal(new Thickness(0), border.BorderThickness);
         }
 
         private class Class1 : Control
diff --git a/tests/Avalonia.Visuals.UnitTests/CornerRadiusTests.cs b/tests/Avalonia.Visuals.UnitTests/CornerRadiusTests.cs
new file mode 100644
index 0000000000..bc0bbdc867
--- /dev/null
+++ b/tests/Avalonia.Visuals.UnitTests/CornerRadiusTests.cs
@@ -0,0 +1,43 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System.Globalization;
+using Xunit;
+
+namespace Avalonia.Visuals.UnitTests
+{
+    public class CornerRadiusTests
+    {
+        [Fact]
+        public void Parse_Parses_Single_Uniform_Radius()
+        {
+            var result = CornerRadius.Parse("3.4", CultureInfo.InvariantCulture);
+
+            Assert.Equal(new CornerRadius(3.4), result);
+        }
+
+        [Fact]
+        public void Parse_Parses_Top_Bottom()
+        {
+            var result = CornerRadius.Parse("1.1,2.2", CultureInfo.InvariantCulture);
+
+            Assert.Equal(new CornerRadius(1.1, 2.2), result);
+        }
+
+        [Fact]
+        public void Parse_Parses_TopLeft_TopRight_BottomRight_BottomLeft()
+        {
+            var result = CornerRadius.Parse("1.1,2.2,3.3,4.4", CultureInfo.InvariantCulture);
+
+            Assert.Equal(new CornerRadius(1.1, 2.2, 3.3, 4.4), result);
+        }
+
+        [Fact]
+        public void Parse_Accepts_Spaces()
+        {
+            var result = CornerRadius.Parse("1.1 2.2 3.3 4.4", CultureInfo.InvariantCulture);
+
+            Assert.Equal(new CornerRadius(1.1, 2.2, 3.3, 4.4), result);
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/Avalonia.Visuals.UnitTests/ThicknessTests.cs b/tests/Avalonia.Visuals.UnitTests/ThicknessTests.cs
index bd694d073a..03bf395d1e 100644
--- a/tests/Avalonia.Visuals.UnitTests/ThicknessTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/ThicknessTests.cs
@@ -4,7 +4,7 @@
 using System.Globalization;
 using Xunit;
 
-namespace Avalonia.Visuals.UnitTests.Media
+namespace Avalonia.Visuals.UnitTests
 {
     public class ThicknessTests
     {
@@ -40,4 +40,4 @@ namespace Avalonia.Visuals.UnitTests.Media
             Assert.Equal(new Thickness(1.2, 3.4, 5, 6), result);
         }
     }
-}
+}
\ No newline at end of file

From 5b9de833a23d6af00562aa5f6aa2507e9c7e9dd5 Mon Sep 17 00:00:00 2001
From: Benedikt Schroeder <benedikt.schroeder@outlook.de>
Date: Thu, 22 Mar 2018 12:24:22 +0100
Subject: [PATCH 2/6] Clean complex rendering code

---
 src/Avalonia.Controls/Border.cs | 299 ++++++++++----------------------
 1 file changed, 92 insertions(+), 207 deletions(-)

diff --git a/src/Avalonia.Controls/Border.cs b/src/Avalonia.Controls/Border.cs
index 4ddf81565a..4fc60478e7 100644
--- a/src/Avalonia.Controls/Border.cs
+++ b/src/Avalonia.Controls/Border.cs
@@ -136,7 +136,6 @@ namespace Avalonia.Controls
             return new Size(padding.Left + padding.Right, padding.Bottom + padding.Top);
         }
 
-
         internal class BorderRenderer
         {
             private bool _useComplexRendering;
@@ -156,19 +155,28 @@ namespace Avalonia.Controls
                     _useComplexRendering = true;
 
                     var boundRect = new Rect(finalSize);
-                    var innerRect = boundRect.Deflate(borderThickness);
-                    var innerRadii = new Radii(cornerRadius, borderThickness, false);
+                    var innerRect = new Rect(borderThickness.Left, borderThickness.Top,
+                        boundRect.Width - borderThickness.Right, boundRect.Height - borderThickness.Bottom);
 
                     StreamGeometry backgroundGeometry = null;
 
-                    //  calculate border / background rendering geometry
-                    if (!innerRect.Width.Equals(0) && !innerRect.Height.Equals(0))
+                    if (!boundRect.Width.Equals(0) && !boundRect.Height.Equals(0))
                     {
                         backgroundGeometry = new StreamGeometry();
 
-                        using (var ctx = backgroundGeometry.Open())
+                        if (cornerRadius.IsEmpty)
                         {
-                            GenerateGeometry(ctx, innerRect, innerRadii);
+                            using (var ctx = backgroundGeometry.Open())
+                            {
+                                CreateGeometry(ctx, innerRect, cornerRadius);
+                            }
+                        }
+                        else
+                        {
+                            using (var ctx = backgroundGeometry.Open())
+                            {
+                                CreateGeometry(ctx, innerRect, cornerRadius);
+                            }
                         }
 
                         _backgroundGeometryCache = backgroundGeometry;
@@ -180,16 +188,31 @@ namespace Avalonia.Controls
 
                     if (!boundRect.Width.Equals(0) && !boundRect.Height.Equals(0))
                     {
-                        var outerRadii = new Radii(cornerRadius, borderThickness, true);
                         var borderGeometry = new StreamGeometry();
 
-                        using (var ctx = borderGeometry.Open())
+                        if (cornerRadius.IsEmpty)
                         {
-                            GenerateGeometry(ctx, boundRect, outerRadii);
+                            using (var ctx = borderGeometry.Open())
+                            {
+                                CreateGeometry(ctx, boundRect, cornerRadius);
 
-                            if (backgroundGeometry != null)
+                                if (backgroundGeometry != null)
+                                {
+                                    CreateGeometry(ctx, innerRect, cornerRadius);
+                                }
+                            }
+                        }
+                        else
+                        {
+                            using (var ctx = borderGeometry.Open())
                             {
-                                GenerateGeometry(ctx, innerRect, innerRadii);
+                                CreateGeometry(ctx, boundRect, cornerRadius);
+
+                                if (backgroundGeometry != null)
+                                {
+                                    CreateGeometry(ctx, innerRect, cornerRadius);
+                                }
+
                             }
                         }
 
@@ -202,228 +225,90 @@ namespace Avalonia.Controls
                 }
             }
 
-            public void Render(DrawingContext context, Size size, Thickness borders, CornerRadius radii, IBrush background, IBrush borderBrush)
+            private static void CreateGeometry(StreamGeometryContext context, Rect boundRect, CornerRadius cornerRadius)
             {
-                if (_useComplexRendering)
+                var topLeft = new Point(boundRect.X + cornerRadius.TopLeft, boundRect.Y);
+                var topRight = new Point(boundRect.Width - cornerRadius.TopRight, boundRect.Y);
+                var rightTop = new Point(boundRect.Width, boundRect.Y + cornerRadius.TopRight);
+                var rightBottom = new Point(boundRect.Width, boundRect.Height - cornerRadius.BottomRight);
+                var bottomRight = new Point(boundRect.Width - cornerRadius.BottomRight, boundRect.Height);
+                var bottomLeft = new Point(boundRect.X + cornerRadius.BottomLeft, boundRect.Height);
+                var leftBottom = new Point(boundRect.X, boundRect.Height - cornerRadius.BottomLeft);
+                var leftTop = new Point(boundRect.X, boundRect.Y + cornerRadius.TopLeft);
+
+                context.BeginFigure(topLeft, true);
+
+                //Top
+                context.LineTo(topRight);
+
+                //TopRight corner
+                if (topRight != rightTop)
                 {
-                    IBrush brush;
-                    var borderGeometry = _borderGeometryCache;
-                    if (borderGeometry != null && (brush = borderBrush) != null)
-                    {
-                        context.DrawGeometry(brush, null, borderGeometry);
-                    }
-
-                    var backgroundGeometry = _backgroundGeometryCache;
-                    if (backgroundGeometry != null && (brush = background) != null)
-                    {
-                        context.DrawGeometry(brush, null, backgroundGeometry);
-                    }
-                }
-                else
-                {
-                    var borderThickness = borders.Left;
-                    var cornerRadius = (float)radii.TopLeft;
-                    var rect = new Rect(size);
-
-                    if (background != null)
-                    {
-                        context.FillRectangle(background, rect.Deflate(borders), cornerRadius);
-                    }
-
-                    if (borderBrush != null && borderThickness > 0)
-                    {
-                        context.DrawRectangle(new Pen(borderBrush, borderThickness), rect.Deflate(borderThickness), cornerRadius);
-                    }
-                }
-            }
-
-            private static void GenerateGeometry(StreamGeometryContext ctx, Rect rect, Radii radii)
-            {
-                //
-                //  Compute the coordinates of the key points
-                //
-
-                var topLeft = new Point(radii.LeftTop, 0);
-                var topRight = new Point(rect.Width - radii.RightTop, 0);
-                var rightTop = new Point(rect.Width, radii.TopRight);
-                var rightBottom = new Point(rect.Width, rect.Height - radii.BottomRight);
-                var bottomRight = new Point(rect.Width - radii.RightBottom, rect.Height);
-                var bottomLeft = new Point(radii.LeftBottom, rect.Height);
-                var leftBottom = new Point(0, rect.Height - radii.BottomLeft);
-                var leftTop = new Point(0, radii.TopLeft);
-
-                //
-                //  Check keypoints for overlap and resolve by partitioning radii according to
-                //  the percentage of each one.  
-                //
-
-                //  Top edge is handled here
-                if (topLeft.X > topRight.X)
-                {
-                    var x = radii.LeftTop / (radii.LeftTop + radii.RightTop) * rect.Width;
-                    topLeft += new Point(x, 0);
-                    topRight += new Point(x, 0);
+                    context.ArcTo(rightTop, new Size(cornerRadius.TopRight, cornerRadius.TopRight), 0, false, SweepDirection.Clockwise);
                 }
 
-                //  Right edge
-                if (rightTop.Y > rightBottom.Y)
-                {
-                    var y = radii.TopRight / (radii.TopRight + radii.BottomRight) * rect.Height;
-                    rightTop += new Point(0, y);
-                    rightBottom += new Point(0, y);
-                }
+                //Right
+                context.LineTo(rightBottom);
 
-                //  Bottom edge
-                if (bottomRight.X < bottomLeft.X)
+                //BottomRight corner
+                if (rightBottom != bottomRight)
                 {
-                    var x = radii.LeftBottom / (radii.LeftBottom + radii.RightBottom) * rect.Width;
-                    bottomRight += new Point(x, 0);
-                    bottomLeft += new Point(x, 0);
+                    context.ArcTo(bottomRight, new Size(cornerRadius.BottomRight, cornerRadius.BottomRight), 0, false, SweepDirection.Clockwise);
                 }
 
-                // Left edge
-                if (leftBottom.Y < leftTop.Y)
-                {
-                    var y = radii.TopLeft / (radii.TopLeft + radii.BottomLeft) * rect.Height;
-                    leftBottom += new Point(0, y);
-                    leftTop += new Point(0, y);
-                }
+                //Bottom
+                context.LineTo(bottomLeft);
 
-                //
-                //  Add on offsets
-                //
-
-                var offset = new Vector(rect.TopLeft.X, rect.TopLeft.Y);
-                topLeft += offset;
-                topRight += offset;
-                rightTop += offset;
-                rightBottom += offset;
-                bottomRight += offset;
-                bottomLeft += offset;
-                leftBottom += offset;
-                leftTop += offset;
-
-                //
-                //  Create the border geometry
-                //
-                ctx.BeginFigure(topLeft, true);
-
-                // Top
-                ctx.LineTo(topRight);
-
-                // TopRight
-                var radiusX = rect.TopRight.X - topRight.X;
-                var radiusY = rightTop.Y - rect.TopRight.Y;
-                if (!radiusX.Equals(0) || !radiusY.Equals(0))
+                //BottomLeft corner
+                if (bottomLeft != leftBottom)
                 {
-                    ctx.ArcTo(rightTop, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise);
+                    context.ArcTo(leftBottom, new Size(cornerRadius.BottomLeft, cornerRadius.BottomLeft), 0, false, SweepDirection.Clockwise);
                 }
 
-                // Right
-                ctx.LineTo(rightBottom);
+                //Left
+                context.LineTo(leftTop);
 
-                // BottomRight
-                radiusX = rect.BottomRight.X - bottomRight.X;
-                radiusY = rect.BottomRight.Y - rightBottom.Y;
-                if (!radiusX.Equals(0) || !radiusY.Equals(0))
+                //TopLeft corner
+                if (leftTop != topLeft)
                 {
-                    ctx.ArcTo(bottomRight, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise);
+                    context.ArcTo(topLeft, new Size(cornerRadius.TopLeft, cornerRadius.TopLeft), 0, false, SweepDirection.Clockwise);
                 }
 
-                // Bottom
-                ctx.LineTo(bottomLeft);
+                context.EndFigure(true);
+            }
 
-                // BottomLeft
-                radiusX = bottomLeft.X - rect.BottomLeft.X;
-                radiusY = rect.BottomLeft.Y - leftBottom.Y;
-                if (!radiusX.Equals(0) || !radiusY.Equals(0))
+            public void Render(DrawingContext context, Size size, Thickness borders, CornerRadius radii, IBrush background, IBrush borderBrush)
+            {
+                if (_useComplexRendering)
                 {
-                    ctx.ArcTo(leftBottom, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise);
-                }
-
-                // Left
-                ctx.LineTo(leftTop);
+                    var backgroundGeometry = _backgroundGeometryCache;
+                    if (backgroundGeometry != null)
+                    {
+                        context.DrawGeometry(background, null, backgroundGeometry);
+                    }
 
-                // TopLeft
-                radiusX = topLeft.X - rect.TopLeft.X;
-                radiusY = leftTop.Y - rect.TopLeft.Y;
-                if (!radiusX.Equals(0) || !radiusY.Equals(0))
-                {
-                    ctx.ArcTo(topLeft, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise);
+                    var borderGeometry = _borderGeometryCache;
+                    if (borderGeometry != null)
+                    {
+                        context.DrawGeometry(borderBrush, null, borderGeometry);
+                    }
                 }
-
-                ctx.EndFigure(true);
-            }
-
-            private struct Radii
-            {
-                internal Radii(CornerRadius radii, Thickness borders, bool outer)
+                else
                 {
-                    var left = 0.5 * borders.Left;
-                    var top = 0.5 * borders.Top;
-                    var right = 0.5 * borders.Right;
-                    var bottom = 0.5 * borders.Bottom;
+                    var borderThickness = borders.Left;
+                    var cornerRadius = (float)radii.TopLeft;
+                    var rect = new Rect(size);
 
-                    if (outer)
+                    if (background != null)
                     {
-                        if (radii.TopLeft.Equals(0))
-                        {
-                            LeftTop = TopLeft = 0.0;
-                        }
-                        else
-                        {
-                            LeftTop = radii.TopLeft + left;
-                            TopLeft = radii.TopLeft + top;
-                        }
-                        if (radii.TopRight.Equals(0))
-                        {
-                            TopRight = RightTop = 0.0;
-                        }
-                        else
-                        {
-                            TopRight = radii.TopRight + top;
-                            RightTop = radii.TopRight + right;
-                        }
-                        if (radii.BottomRight.Equals(0))
-                        {
-                            RightBottom = BottomRight = 0.0;
-                        }
-                        else
-                        {
-                            RightBottom = radii.BottomRight + right;
-                            BottomRight = radii.BottomRight + bottom;
-                        }
-                        if (radii.BottomLeft.Equals(0))
-                        {
-                            BottomLeft = LeftBottom = 0.0;
-                        }
-                        else
-                        {
-                            BottomLeft = radii.BottomLeft + bottom;
-                            LeftBottom = radii.BottomLeft + left;
-                        }
+                        context.FillRectangle(background, rect.Deflate(borders), cornerRadius);
                     }
-                    else
+
+                    if (borderBrush != null && borderThickness > 0)
                     {
-                        LeftTop = Math.Max(0.0, radii.TopLeft - left);
-                        TopLeft = Math.Max(0.0, radii.TopLeft - top);
-                        TopRight = Math.Max(0.0, radii.TopRight - top);
-                        RightTop = Math.Max(0.0, radii.TopRight - right);
-                        RightBottom = Math.Max(0.0, radii.BottomRight - right);
-                        BottomRight = Math.Max(0.0, radii.BottomRight - bottom);
-                        BottomLeft = Math.Max(0.0, radii.BottomLeft - bottom);
-                        LeftBottom = Math.Max(0.0, radii.BottomLeft - left);
+                        context.DrawRectangle(new Pen(borderBrush, borderThickness), rect.Deflate(borderThickness), cornerRadius);
                     }
                 }
-
-                internal readonly double LeftTop;
-                internal readonly double TopLeft;
-                internal readonly double TopRight;
-                internal readonly double RightTop;
-                internal readonly double RightBottom;
-                internal readonly double BottomRight;
-                internal readonly double BottomLeft;
-                internal readonly double LeftBottom;
             }
         }
     }

From 1b283105fefd43abaf39906d2e8242a9ad9924b9 Mon Sep 17 00:00:00 2001
From: Benedikt Schroeder <benedikt.schroeder@outlook.de>
Date: Fri, 23 Mar 2018 13:48:06 +0100
Subject: [PATCH 3/6] Removed redundant if

---
 src/Avalonia.Controls/Border.cs | 47 ++++++++-------------------------
 1 file changed, 11 insertions(+), 36 deletions(-)

diff --git a/src/Avalonia.Controls/Border.cs b/src/Avalonia.Controls/Border.cs
index 4fc60478e7..2dd3c0fa05 100644
--- a/src/Avalonia.Controls/Border.cs
+++ b/src/Avalonia.Controls/Border.cs
@@ -156,27 +156,18 @@ namespace Avalonia.Controls
 
                     var boundRect = new Rect(finalSize);
                     var innerRect = new Rect(borderThickness.Left, borderThickness.Top,
-                        boundRect.Width - borderThickness.Right, boundRect.Height - borderThickness.Bottom);
+                        Math.Max(0, boundRect.Width - borderThickness.Right), 
+                        Math.Max(0, boundRect.Height - borderThickness.Bottom));
 
                     StreamGeometry backgroundGeometry = null;
 
-                    if (!boundRect.Width.Equals(0) && !boundRect.Height.Equals(0))
+                    if (!innerRect.Width.Equals(0) && !innerRect.Height.Equals(0))
                     {
                         backgroundGeometry = new StreamGeometry();
 
-                        if (cornerRadius.IsEmpty)
+                        using (var ctx = backgroundGeometry.Open())
                         {
-                            using (var ctx = backgroundGeometry.Open())
-                            {
-                                CreateGeometry(ctx, innerRect, cornerRadius);
-                            }
-                        }
-                        else
-                        {
-                            using (var ctx = backgroundGeometry.Open())
-                            {
-                                CreateGeometry(ctx, innerRect, cornerRadius);
-                            }
+                            CreateGeometry(ctx, innerRect, cornerRadius);
                         }
 
                         _backgroundGeometryCache = backgroundGeometry;
@@ -184,35 +175,19 @@ namespace Avalonia.Controls
                     else
                     {
                         _backgroundGeometryCache = null;
-                    }
+                    }                  
 
-                    if (!boundRect.Width.Equals(0) && !boundRect.Height.Equals(0))
+                    if (!boundRect.Width.Equals(0) && !innerRect.Height.Equals(0))
                     {
                         var borderGeometry = new StreamGeometry();
 
-                        if (cornerRadius.IsEmpty)
+                        using (var ctx = borderGeometry.Open())
                         {
-                            using (var ctx = borderGeometry.Open())
-                            {
-                                CreateGeometry(ctx, boundRect, cornerRadius);
+                            CreateGeometry(ctx, boundRect, cornerRadius);
 
-                                if (backgroundGeometry != null)
-                                {
-                                    CreateGeometry(ctx, innerRect, cornerRadius);
-                                }
-                            }
-                        }
-                        else
-                        {
-                            using (var ctx = borderGeometry.Open())
+                            if (backgroundGeometry != null)
                             {
-                                CreateGeometry(ctx, boundRect, cornerRadius);
-
-                                if (backgroundGeometry != null)
-                                {
-                                    CreateGeometry(ctx, innerRect, cornerRadius);
-                                }
-
+                                CreateGeometry(ctx, innerRect, cornerRadius);
                             }
                         }
 

From 50dd6cb66d82ee19e872e9f56f6f5d284dc198d2 Mon Sep 17 00:00:00 2001
From: Benedikt Schroeder <benedikt.schroeder@outlook.de>
Date: Mon, 26 Mar 2018 11:39:17 +0200
Subject: [PATCH 4/6] Requested changes

---
 src/Avalonia.Controls/Border.cs               | 161 +---------
 .../Presenters/ContentPresenter.cs            |   7 +-
 .../Utils/BorderRenderHelper.cs               | 279 ++++++++++++++++++
 .../Accents/BaseLight.xaml                    |   5 +-
 src/Avalonia.Visuals/CornerRadius.cs          |  10 +-
 .../Properties/AssemblyInfo.cs                |   1 +
 .../Avalonia.Direct2D1/Media/GeometryImpl.cs  |  12 +-
 7 files changed, 297 insertions(+), 178 deletions(-)
 create mode 100644 src/Avalonia.Controls/Utils/BorderRenderHelper.cs

diff --git a/src/Avalonia.Controls/Border.cs b/src/Avalonia.Controls/Border.cs
index 2dd3c0fa05..06ad8a4837 100644
--- a/src/Avalonia.Controls/Border.cs
+++ b/src/Avalonia.Controls/Border.cs
@@ -1,8 +1,8 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
-using System;
 using Avalonia;
+using Avalonia.Controls.Utils;
 using Avalonia.Media;
 
 namespace Avalonia.Controls
@@ -10,7 +10,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// A control which decorates a child with a border and background.
     /// </summary>
-    public class Border : Decorator
+    public partial class Border : Decorator
     {
         /// <summary>
         /// Defines the <see cref="Background"/> property.
@@ -36,7 +36,7 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<CornerRadius> CornerRadiusProperty =
             AvaloniaProperty.Register<Border, CornerRadius>(nameof(CornerRadius));
 
-        private readonly BorderRenderer _borderRenderer = new BorderRenderer();
+        private readonly BorderRenderHelper _borderRenderHelper = new BorderRenderHelper();
 
         /// <summary>
         /// Initializes static members of the <see cref="Border"/> class.
@@ -88,7 +88,7 @@ namespace Avalonia.Controls
         /// <param name="context">The drawing context.</param>
         public override void Render(DrawingContext context)
         {
-            _borderRenderer.Render(context, Bounds.Size, BorderThickness, CornerRadius, Background, BorderBrush);
+            _borderRenderHelper.Render(context, Bounds.Size, BorderThickness, CornerRadius, Background, BorderBrush);
         }
 
         /// <summary>
@@ -114,7 +114,7 @@ namespace Avalonia.Controls
                 Child.Arrange(new Rect(finalSize).Deflate(padding));
             }
 
-            _borderRenderer.Update(finalSize, BorderThickness, CornerRadius);
+            _borderRenderHelper.Update(finalSize, BorderThickness, CornerRadius);           
 
             return finalSize;
         }
@@ -135,156 +135,5 @@ namespace Avalonia.Controls
 
             return new Size(padding.Left + padding.Right, padding.Bottom + padding.Top);
         }
-
-        internal class BorderRenderer
-        {
-            private bool _useComplexRendering;
-            private StreamGeometry _backgroundGeometryCache;
-            private StreamGeometry _borderGeometryCache;
-
-            public void Update(Size finalSize, Thickness borderThickness, CornerRadius cornerRadius)
-            {
-                if (borderThickness.IsUniform && cornerRadius.IsUniform)
-                {
-                    _backgroundGeometryCache = null;
-                    _borderGeometryCache = null;
-                    _useComplexRendering = false;
-                }
-                else
-                {
-                    _useComplexRendering = true;
-
-                    var boundRect = new Rect(finalSize);
-                    var innerRect = new Rect(borderThickness.Left, borderThickness.Top,
-                        Math.Max(0, boundRect.Width - borderThickness.Right), 
-                        Math.Max(0, boundRect.Height - borderThickness.Bottom));
-
-                    StreamGeometry backgroundGeometry = null;
-
-                    if (!innerRect.Width.Equals(0) && !innerRect.Height.Equals(0))
-                    {
-                        backgroundGeometry = new StreamGeometry();
-
-                        using (var ctx = backgroundGeometry.Open())
-                        {
-                            CreateGeometry(ctx, innerRect, cornerRadius);
-                        }
-
-                        _backgroundGeometryCache = backgroundGeometry;
-                    }
-                    else
-                    {
-                        _backgroundGeometryCache = null;
-                    }                  
-
-                    if (!boundRect.Width.Equals(0) && !innerRect.Height.Equals(0))
-                    {
-                        var borderGeometry = new StreamGeometry();
-
-                        using (var ctx = borderGeometry.Open())
-                        {
-                            CreateGeometry(ctx, boundRect, cornerRadius);
-
-                            if (backgroundGeometry != null)
-                            {
-                                CreateGeometry(ctx, innerRect, cornerRadius);
-                            }
-                        }
-
-                        _borderGeometryCache = borderGeometry;
-                    }
-                    else
-                    {
-                        _borderGeometryCache = null;
-                    }
-                }
-            }
-
-            private static void CreateGeometry(StreamGeometryContext context, Rect boundRect, CornerRadius cornerRadius)
-            {
-                var topLeft = new Point(boundRect.X + cornerRadius.TopLeft, boundRect.Y);
-                var topRight = new Point(boundRect.Width - cornerRadius.TopRight, boundRect.Y);
-                var rightTop = new Point(boundRect.Width, boundRect.Y + cornerRadius.TopRight);
-                var rightBottom = new Point(boundRect.Width, boundRect.Height - cornerRadius.BottomRight);
-                var bottomRight = new Point(boundRect.Width - cornerRadius.BottomRight, boundRect.Height);
-                var bottomLeft = new Point(boundRect.X + cornerRadius.BottomLeft, boundRect.Height);
-                var leftBottom = new Point(boundRect.X, boundRect.Height - cornerRadius.BottomLeft);
-                var leftTop = new Point(boundRect.X, boundRect.Y + cornerRadius.TopLeft);
-
-                context.BeginFigure(topLeft, true);
-
-                //Top
-                context.LineTo(topRight);
-
-                //TopRight corner
-                if (topRight != rightTop)
-                {
-                    context.ArcTo(rightTop, new Size(cornerRadius.TopRight, cornerRadius.TopRight), 0, false, SweepDirection.Clockwise);
-                }
-
-                //Right
-                context.LineTo(rightBottom);
-
-                //BottomRight corner
-                if (rightBottom != bottomRight)
-                {
-                    context.ArcTo(bottomRight, new Size(cornerRadius.BottomRight, cornerRadius.BottomRight), 0, false, SweepDirection.Clockwise);
-                }
-
-                //Bottom
-                context.LineTo(bottomLeft);
-
-                //BottomLeft corner
-                if (bottomLeft != leftBottom)
-                {
-                    context.ArcTo(leftBottom, new Size(cornerRadius.BottomLeft, cornerRadius.BottomLeft), 0, false, SweepDirection.Clockwise);
-                }
-
-                //Left
-                context.LineTo(leftTop);
-
-                //TopLeft corner
-                if (leftTop != topLeft)
-                {
-                    context.ArcTo(topLeft, new Size(cornerRadius.TopLeft, cornerRadius.TopLeft), 0, false, SweepDirection.Clockwise);
-                }
-
-                context.EndFigure(true);
-            }
-
-            public void Render(DrawingContext context, Size size, Thickness borders, CornerRadius radii, IBrush background, IBrush borderBrush)
-            {
-                if (_useComplexRendering)
-                {
-                    var backgroundGeometry = _backgroundGeometryCache;
-                    if (backgroundGeometry != null)
-                    {
-                        context.DrawGeometry(background, null, backgroundGeometry);
-                    }
-
-                    var borderGeometry = _borderGeometryCache;
-                    if (borderGeometry != null)
-                    {
-                        context.DrawGeometry(borderBrush, null, borderGeometry);
-                    }
-                }
-                else
-                {
-                    var borderThickness = borders.Left;
-                    var cornerRadius = (float)radii.TopLeft;
-                    var rect = new Rect(size);
-
-                    if (background != null)
-                    {
-                        context.FillRectangle(background, rect.Deflate(borders), cornerRadius);
-                    }
-
-                    if (borderBrush != null && borderThickness > 0)
-                    {
-                        context.DrawRectangle(new Pen(borderBrush, borderThickness), rect.Deflate(borderThickness), cornerRadius);
-                    }
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Controls/Presenters/ContentPresenter.cs b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
index 2d623dcbf7..cc6c6f364f 100644
--- a/src/Avalonia.Controls/Presenters/ContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
@@ -4,6 +4,7 @@
 using System;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
+using Avalonia.Controls.Utils;
 using Avalonia.Layout;
 using Avalonia.LogicalTree;
 using Avalonia.Media;
@@ -76,12 +77,12 @@ namespace Avalonia.Controls.Presenters
         /// Defines the <see cref="Padding"/> property.
         /// </summary>
         public static readonly StyledProperty<Thickness> PaddingProperty =
-            Border.PaddingProperty.AddOwner<ContentPresenter>();
+            Decorator.PaddingProperty.AddOwner<ContentPresenter>();
 
         private IControl _child;
         private bool _createdChild;
         private IDataTemplate _dataTemplate;
-        private readonly Border.BorderRenderer _borderRenderer = new Border.BorderRenderer();
+        private readonly BorderRenderHelper _borderRenderer = new BorderRenderHelper();
 
         /// <summary>
         /// Initializes static members of the <see cref="ContentPresenter"/> class.
@@ -438,7 +439,7 @@ namespace Avalonia.Controls.Presenters
         {
             var result = (VisualRoot as ILayoutRoot)?.LayoutScaling ?? 1.0;
 
-            if (result.Equals(0) || double.IsNaN(result) || double.IsInfinity(result))
+            if (result == 0 || double.IsNaN(result) || double.IsInfinity(result))
             {
                 throw new Exception($"Invalid LayoutScaling returned from {VisualRoot.GetType()}");
             }
diff --git a/src/Avalonia.Controls/Utils/BorderRenderHelper.cs b/src/Avalonia.Controls/Utils/BorderRenderHelper.cs
new file mode 100644
index 0000000000..d9169e51f3
--- /dev/null
+++ b/src/Avalonia.Controls/Utils/BorderRenderHelper.cs
@@ -0,0 +1,279 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using Avalonia.Media;
+
+namespace Avalonia.Controls.Utils
+{
+    internal class BorderRenderHelper
+    {
+        private bool _useComplexRendering;
+        private StreamGeometry _backgroundGeometryCache;
+        private StreamGeometry _borderGeometryCache;
+
+        public void Update(Size finalSize, Thickness borderThickness, CornerRadius cornerRadius)
+        {
+            if (borderThickness.IsUniform && cornerRadius.IsUniform)
+            {
+                _backgroundGeometryCache = null;
+                _borderGeometryCache = null;
+                _useComplexRendering = false;
+            }
+            else
+            {
+                _useComplexRendering = true;
+
+                var boundRect = new Rect(finalSize);
+                var innerRect = boundRect.Deflate(borderThickness);
+                var innerCoordinates = new BorderCoordinates(cornerRadius, borderThickness, false);
+
+                StreamGeometry backgroundGeometry = null;
+
+                if (innerRect.Width != 0 && innerRect.Height != 0)
+                {
+                    backgroundGeometry = new StreamGeometry();
+
+                    using (var ctx = backgroundGeometry.Open())
+                    {
+                        CreateGeometry(ctx, innerRect, innerCoordinates);
+                    }
+
+                    _backgroundGeometryCache = backgroundGeometry;
+                }
+                else
+                {
+                    _backgroundGeometryCache = null;
+                }
+
+                if (boundRect.Width != 0 && innerRect.Height != 0)
+                {
+                    var outerCoordinates = new BorderCoordinates(cornerRadius, borderThickness, true);
+                    var borderGeometry = new StreamGeometry();
+
+                    using (var ctx = borderGeometry.Open())
+                    {
+                        CreateGeometry(ctx, boundRect, outerCoordinates);
+
+                        if (backgroundGeometry != null)
+                        {
+                            CreateGeometry(ctx, innerRect, innerCoordinates);
+                        }
+                    }
+
+                    _borderGeometryCache = borderGeometry;
+                }
+                else
+                {
+                    _borderGeometryCache = null;
+                }
+            }
+        }
+
+        public void Render(DrawingContext context, Size size, Thickness borders, CornerRadius radii, IBrush background, IBrush borderBrush)
+        {
+            if (_useComplexRendering)
+            {
+                var backgroundGeometry = _backgroundGeometryCache;
+                if (backgroundGeometry != null)
+                {
+                    context.DrawGeometry(background, null, backgroundGeometry);
+                }
+
+                var borderGeometry = _borderGeometryCache;
+                if (borderGeometry != null)
+                {
+                    context.DrawGeometry(borderBrush, null, borderGeometry);
+                }
+            }
+            else
+            {
+                var borderThickness = borders.Left;
+                var cornerRadius = (float)radii.TopLeft;
+                var rect = new Rect(size);
+
+                if (background != null)
+                {
+                    context.FillRectangle(background, rect.Deflate(borders), cornerRadius);
+                }
+
+                if (borderBrush != null && borderThickness > 0)
+                {
+                    context.DrawRectangle(new Pen(borderBrush, borderThickness), rect.Deflate(borderThickness), cornerRadius);
+                }
+            }
+        }
+
+        private static void CreateGeometry(StreamGeometryContext context, Rect boundRect, BorderCoordinates borderCoordinates)
+        {
+            var topLeft = new Point(borderCoordinates.LeftTop, 0);
+            var topRight = new Point(boundRect.Width - borderCoordinates.RightTop, 0);
+            var rightTop = new Point(boundRect.Width, borderCoordinates.TopRight);
+            var rightBottom = new Point(boundRect.Width, boundRect.Height - borderCoordinates.BottomRight);
+            var bottomRight = new Point(boundRect.Width - borderCoordinates.RightBottom, boundRect.Height);
+            var bottomLeft = new Point(borderCoordinates.LeftBottom, boundRect.Height);
+            var leftBottom = new Point(0, boundRect.Height - borderCoordinates.BottomLeft);
+            var leftTop = new Point(0, borderCoordinates.TopLeft);
+
+
+            if (topLeft.X > topRight.X)
+            {
+                var scaledX = borderCoordinates.LeftTop / (borderCoordinates.LeftTop + borderCoordinates.RightTop) * boundRect.Width;
+                topLeft = new Point(scaledX, topLeft.Y);
+                topRight = new Point(scaledX, topRight.Y);
+            }
+
+            if (rightTop.Y > rightBottom.Y)
+            {
+                var scaledY = borderCoordinates.TopRight / (borderCoordinates.TopRight + borderCoordinates.BottomRight) * boundRect.Height;
+                rightTop = new Point(rightTop.X, scaledY);
+                rightBottom = new Point(rightBottom.X, scaledY);
+            }
+
+            if (bottomRight.X < bottomLeft.X)
+            {
+                var scaledX = borderCoordinates.LeftBottom / (borderCoordinates.LeftBottom + borderCoordinates.RightBottom) * boundRect.Width;
+                bottomRight = new Point(scaledX, bottomRight.Y);
+                bottomLeft = new Point(scaledX, bottomLeft.Y);
+            }
+
+            if (leftBottom.Y < leftTop.Y)
+            {
+                var scaledY = borderCoordinates.TopLeft / (borderCoordinates.TopLeft + borderCoordinates.BottomLeft) * boundRect.Height;
+                leftBottom = new Point(leftBottom.X, scaledY);
+                leftTop = new Point(leftTop.X, scaledY);
+            }
+
+            var offset = new Vector(boundRect.TopLeft.X, boundRect.TopLeft.Y);
+            topLeft += offset;
+            topRight += offset;
+            rightTop += offset;
+            rightBottom += offset;
+            bottomRight += offset;
+            bottomLeft += offset;
+            leftBottom += offset;
+            leftTop += offset;
+
+            context.BeginFigure(topLeft, true);
+
+            //Top
+            context.LineTo(topRight);
+
+            //TopRight corner
+            var radiusX = boundRect.TopRight.X - topRight.X;
+            var radiusY = rightTop.Y - boundRect.TopRight.Y;
+            if (radiusX != 0 || radiusY != 0)
+            {
+                context.ArcTo(rightTop, new Size(radiusY, radiusY), 0, false, SweepDirection.Clockwise);
+            }
+
+            //Right
+            context.LineTo(rightBottom);
+
+            //BottomRight corner
+            radiusX = boundRect.BottomRight.X - bottomRight.X;
+            radiusY = boundRect.BottomRight.Y - rightBottom.Y;
+            if (radiusX != 0 || radiusY != 0)
+            {
+                context.ArcTo(bottomRight, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise);
+            }
+
+            //Bottom
+            context.LineTo(bottomLeft);
+
+            //BottomLeft corner
+            radiusX = bottomLeft.X - boundRect.BottomLeft.X;
+            radiusY = boundRect.BottomLeft.Y - leftBottom.Y;
+            if (radiusX != 0 || radiusY != 0)
+            {
+                context.ArcTo(leftBottom, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise);
+            }
+
+            //Left
+            context.LineTo(leftTop);
+
+            //TopLeft corner
+            radiusX = topLeft.X - boundRect.TopLeft.X;
+            radiusY = leftTop.Y - boundRect.TopLeft.Y;
+
+            if (radiusX != 0 || radiusY != 0)
+            {
+                context.ArcTo(topLeft, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise);
+            }
+
+            context.EndFigure(true);
+        }
+
+        private struct BorderCoordinates
+        {
+            internal BorderCoordinates(CornerRadius cornerRadius, Thickness borderThickness, bool isOuter)
+            {
+                var left = 0.5 * borderThickness.Left;
+                var top = 0.5 * borderThickness.Top;
+                var right = 0.5 * borderThickness.Right;
+                var bottom = 0.5 * borderThickness.Bottom;
+
+                if (isOuter)
+                {
+                    if (cornerRadius.TopLeft == 0)
+                    {
+                        LeftTop = TopLeft = 0.0;
+                    }
+                    else
+                    {
+                        LeftTop = cornerRadius.TopLeft + left;
+                        TopLeft = cornerRadius.TopLeft + top;
+                    }
+                    if (cornerRadius.TopRight == 0)
+                    {
+                        TopRight = RightTop = 0;
+                    }
+                    else
+                    {
+                        TopRight = cornerRadius.TopRight + top;
+                        RightTop = cornerRadius.TopRight + right;
+                    }
+                    if (cornerRadius.BottomRight == 0)
+                    {
+                        RightBottom = BottomRight = 0;
+                    }
+                    else
+                    {
+                        RightBottom = cornerRadius.BottomRight + right;
+                        BottomRight = cornerRadius.BottomRight + bottom;
+                    }
+                    if (cornerRadius.BottomLeft == 0)
+                    {
+                        BottomLeft = LeftBottom = 0;
+                    }
+                    else
+                    {
+                        BottomLeft = cornerRadius.BottomLeft + bottom;
+                        LeftBottom = cornerRadius.BottomLeft + left;
+                    }
+                }
+                else
+                {
+                    LeftTop = Math.Max(0, cornerRadius.TopLeft - left);
+                    TopLeft = Math.Max(0, cornerRadius.TopLeft - top);
+                    TopRight = Math.Max(0, cornerRadius.TopRight - top);
+                    RightTop = Math.Max(0, cornerRadius.TopRight - right);
+                    RightBottom = Math.Max(0, cornerRadius.BottomRight - right);
+                    BottomRight = Math.Max(0, cornerRadius.BottomRight - bottom);
+                    BottomLeft = Math.Max(0, cornerRadius.BottomLeft - bottom);
+                    LeftBottom = Math.Max(0, cornerRadius.BottomLeft - left);
+                }
+            }
+
+            internal readonly double LeftTop;
+            internal readonly double TopLeft;
+            internal readonly double TopRight;
+            internal readonly double RightTop;
+            internal readonly double RightBottom;
+            internal readonly double BottomRight;
+            internal readonly double BottomLeft;
+            internal readonly double LeftBottom;
+        }
+
+    }
+}
diff --git a/src/Avalonia.Themes.Default/Accents/BaseLight.xaml b/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
index ebb14579b4..4c85e172ff 100644
--- a/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
+++ b/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
@@ -1,7 +1,6 @@
 <Style xmlns="https://github.com/avaloniaui"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       xmlns:sys="clr-namespace:System;assembly=mscorlib"
-       xmlns:avalonia="clr-namespace:Avalonia;assembly=Avalonia.Visuals">
+       xmlns:sys="clr-namespace:System;assembly=mscorlib">
   <Style.Resources>
     <SolidColorBrush x:Key="ThemeBackgroundBrush">#FFFFFFFF</SolidColorBrush>
     <SolidColorBrush x:Key="ThemeBorderLightBrush">#FFAAAAAA</SolidColorBrush>
@@ -21,7 +20,7 @@
     <SolidColorBrush x:Key="ErrorBrush">Red</SolidColorBrush>
     <SolidColorBrush x:Key="ErrorBrushLight">#10ff0000</SolidColorBrush>
 
-    <avalonia:Thickness x:Key="ThemeBorderThickness">2</avalonia:Thickness>
+    <Thickness x:Key="ThemeBorderThickness">2</Thickness>
     <sys:Double x:Key="ThemeDisabledOpacity">0.5</sys:Double>
 
     <sys:Double x:Key="FontSizeSmall">10</sys:Double>
diff --git a/src/Avalonia.Visuals/CornerRadius.cs b/src/Avalonia.Visuals/CornerRadius.cs
index 25e3b103cd..db0ac97d49 100644
--- a/src/Avalonia.Visuals/CornerRadius.cs
+++ b/src/Avalonia.Visuals/CornerRadius.cs
@@ -83,15 +83,15 @@ namespace Avalonia
 
         public static bool operator ==(CornerRadius cr1, CornerRadius cr2)
         {
-            return ((cr1.TopLeft.Equals(cr2.TopLeft) || double.IsNaN(cr1.TopLeft) && double.IsNaN(cr2.TopLeft)))
-                   && (cr1.TopRight.Equals(cr2.TopRight) || (double.IsNaN(cr1.TopRight) && double.IsNaN(cr2.TopRight)))
-                   && (cr1.BottomRight.Equals(cr2.BottomRight) || double.IsNaN(cr1.BottomRight) && double.IsNaN(cr2.BottomRight))
-                   && (cr1.BottomLeft.Equals(cr2.BottomLeft) || double.IsNaN(cr1.BottomLeft) && double.IsNaN(cr2.BottomLeft));
+            return cr1.TopLeft.Equals(cr2.TopLeft)
+                   && cr1.TopRight.Equals(cr2.TopRight)
+                   && cr1.BottomRight.Equals(cr2.BottomRight) 
+                   && cr1.BottomLeft.Equals(cr2.BottomLeft);
         }
 
         public static bool operator !=(CornerRadius cr1, CornerRadius cr2)
         {
-            return (!(cr1 == cr2));
+            return !(cr1 == cr2);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Visuals/Properties/AssemblyInfo.cs b/src/Avalonia.Visuals/Properties/AssemblyInfo.cs
index 87347d64b1..900746d05a 100644
--- a/src/Avalonia.Visuals/Properties/AssemblyInfo.cs
+++ b/src/Avalonia.Visuals/Properties/AssemblyInfo.cs
@@ -9,6 +9,7 @@ using Avalonia.Metadata;
 [assembly: InternalsVisibleTo("Avalonia.Visuals.UnitTests")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Media")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia")]
 
 [assembly: InternalsVisibleTo("Avalonia.Direct2D1.RenderTests")]
 [assembly: InternalsVisibleTo("Avalonia.Skia.RenderTests")]
\ No newline at end of file
diff --git a/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
index 4b0bb4d7f9..092b49e209 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
@@ -1,7 +1,6 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
-using System;
 using Avalonia.Platform;
 using SharpDX.Direct2D1;
 
@@ -20,21 +19,12 @@ namespace Avalonia.Direct2D1.Media
         /// <inheritdoc/>
         public Rect Bounds => Geometry.GetWidenedBounds(0).ToAvalonia();
 
-        /// <inheritdoc/>
         public Geometry Geometry { get; }
 
         /// <inheritdoc/>
         public Rect GetRenderBounds(Avalonia.Media.Pen pen)
         {
-            //var factory = AvaloniaLocator.Current.GetService<Factory>();
-            if (pen == null)
-            {
-                return Geometry.GetWidenedBounds(0).ToAvalonia();
-            }
-            else
-            {
-                return Geometry.GetWidenedBounds((float)pen.Thickness).ToAvalonia();
-            }
+            return Geometry.GetWidenedBounds((float) (pen?.Thickness ?? 0)).ToAvalonia();
         }
 
         /// <inheritdoc/>

From 253ff568952e1b122f3f0efac98ac7bfc7e6e704 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 3 Apr 2018 23:05:08 +0200
Subject: [PATCH 5/6] Added a couple of Border CornerRadius render tests.

---
 .../Controls/BorderTests.cs                   |  40 ++++++++++++++++++
 ...order_NonUniform_CornerRadius.expected.png | Bin 0 -> 1084 bytes
 .../Border_Uniform_CornerRadius.expected.png  | Bin 0 -> 1307 bytes
 ...order_NonUniform_CornerRadius.expected.png | Bin 0 -> 1084 bytes
 .../Border_Uniform_CornerRadius.expected.png  | Bin 0 -> 1307 bytes
 5 files changed, 40 insertions(+)
 create mode 100644 tests/TestFiles/Direct2D1/Controls/Border/Border_NonUniform_CornerRadius.expected.png
 create mode 100644 tests/TestFiles/Direct2D1/Controls/Border/Border_Uniform_CornerRadius.expected.png
 create mode 100644 tests/TestFiles/Skia/Controls/Border/Border_NonUniform_CornerRadius.expected.png
 create mode 100644 tests/TestFiles/Skia/Controls/Border/Border_Uniform_CornerRadius.expected.png

diff --git a/tests/Avalonia.RenderTests/Controls/BorderTests.cs b/tests/Avalonia.RenderTests/Controls/BorderTests.cs
index 411870785a..7d2e40c3b4 100644
--- a/tests/Avalonia.RenderTests/Controls/BorderTests.cs
+++ b/tests/Avalonia.RenderTests/Controls/BorderTests.cs
@@ -58,6 +58,46 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
             CompareImages();
         }
 
+        [Fact]
+        public async Task Border_Uniform_CornerRadius()
+        {
+            Decorator target = new Decorator
+            {
+                Padding = new Thickness(8),
+                Width = 200,
+                Height = 200,
+                Child = new Border
+                {
+                    BorderBrush = Brushes.Black,
+                    BorderThickness = new Thickness(2),
+                    CornerRadius = new CornerRadius(16),
+                }
+            };
+
+            await RenderToFile(target);
+            CompareImages();
+        }
+
+        [Fact]
+        public async Task Border_NonUniform_CornerRadius()
+        {
+            Decorator target = new Decorator
+            {
+                Padding = new Thickness(8),
+                Width = 200,
+                Height = 200,
+                Child = new Border
+                {
+                    BorderBrush = Brushes.Black,
+                    BorderThickness = new Thickness(2),
+                    CornerRadius = new CornerRadius(16, 4, 7, 10),
+                }
+            };
+
+            await RenderToFile(target);
+            CompareImages();
+        }
+
         [Fact]
         public async Task Border_Fill()
         {
diff --git a/tests/TestFiles/Direct2D1/Controls/Border/Border_NonUniform_CornerRadius.expected.png b/tests/TestFiles/Direct2D1/Controls/Border/Border_NonUniform_CornerRadius.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..9deb45aaeb067d61c2774ba50214b80950db4763
GIT binary patch
literal 1084
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yF%}28J29*~C-V}>VM%xNb!1@J
z*w6hZk(Ggg`I)DSV@O5Z+gl4y$Fj;C`&gb7V;~_W*3-?lIB~&(gBuhgdf65q+>kcy
zFDG|cqNB@^1qRKIvk#^P1k6YXh={mRciuvLnjBwM+}`K+&a=z$z32R{`~3I3;`g=s
zK-+-8@5<DtJEpGQd_8^r*}OCB^iNm**#Fn?ciy*;Z)VT=v3`%y@1$=9-)_7)@jaug
zy6ok;v+vH$`}_2J`p>84={vi3R2S%cGWq;ar}0VDS<|Y_PmlQ1e!A`~zB5x*!lLXa
z^SsyJHZQl2ZTg<p&h`Fm+^mCfPy8ljo7X=upKkH#(M@+tM(dItZRS&tuR1*U@!vTO
zb8p#9*t6ea&+~%k3GdDLpM1y+y;pqTUapkKzUL>ppI+9=KViu_n{ARl<L9KG8sdHj
z(;A<2?>lV%WZ&}#Avt0v)<(u@+@ElGWrXO7;?o;X+RGiAep>L{u~`nE{)c>gThy|7
zquPWTUHSd`?hhpE&wg6-Y=4oZ>gs#VYc}5GJ}4Mj8oR#oNYiFj0Sy+WR)+-w93o7O
zP6`1WEL@Eailc%986ZbzIsA+33!kn$r`NRc&n}tuy6zUz*-SqRE$_wj6_{OP`Si1>
zCf)MTy}dhR`2F4gpW@!kzWMm(@?xg4cV{ElJ+Jn!zjfgD<~<MQZ+;C-b!F+(UjO`d
zdA`}FlRElU^=d-jUR}Mp_~zl8y>o7O$!)EhC;LuCZu^bdM?T)xx&DFOa^qH)qVj3+
z6KZWw=e}Bd^I<Q)%;cEqmFFiOUv<Z_=x&{9bzNDe&=LL3&Khae5pt`Go=3<YpZfHN
z|C8BYqc@wU>7W0!Po-SKLhYx<_un`9H~XjCpM_+=b9as&74}<xbj{mLxe}0&r>mdK
II;Vst0D%^uoB#j-

literal 0
HcmV?d00001

diff --git a/tests/TestFiles/Direct2D1/Controls/Border/Border_Uniform_CornerRadius.expected.png b/tests/TestFiles/Direct2D1/Controls/Border/Border_Uniform_CornerRadius.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4bfa75eb8fad329e993f4dde010964fa5572837
GIT binary patch
literal 1307
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yF%}28J29*~C-V}>VM%xNb!1@J
z*w6hZkrl{2>gnPbQW5v|*4n<%bcwda6{{SS1UOilm>m>6yPB7Dc=0V*v<}E;X?!AJ
z!N6k5o5|!UTqSUVi-ogvf`Y)8>KDI+&e-G}x@Ek1+4ZS=A~zg4)A9XWoc(VRpk)jU
z2RKWsEZ03fGb1~>PNF#T%+J&!xoh9@&a6(2>#MYTc5}uY`!K!!N~>poXY?PFd6>e!
zx%=ix<?_5Uiw)=hZ`40_N4B`s$Ii8;YJ>jGwQnNI-kzKB=HBz&Gwz=0lk5Bwn1AdE
zzvou|<1#npnY%Y9%k|6*H@<l>=9~Pg`NwM{Cfh$aIfFa-fyK$a`DMn|vtsw!J_}Ik
z`*Z2c-#HD*Z|=?5xqj!D`>SKZ&iePo7crSVxHd!bWbd3C?RVnORP)W3$vOK+rPBIY
zlHZzKyS1lEWpgg>QLp^-vR?a?@zXyKY$OYu&xNIyKfk<I+j8TyJryVU&n}L+vFS}g
znWgpKu01_7uU4Kvc<t%O{4z`a*<qEPwZ%Sl3HO2yc^cf`@%&}j*SkeIpN<~>k!*SB
z+S%BB`(*gHcq{x|=ly4^OycWjdi5WtB~EuJIxDt*x^m9lJ5NLBop^TCYu)u4?dg-1
zcF&o6F0X#`p9MT~RIJ~A)tesiVZW+?1`AWG!vX;g5vE2bg#Zo~u0{vNQ9-%}$ZnQT
zd6x4c`!<voPk){#pE2DbPWSld(}LUb-hHw^{m~&__{7eq9MR_GKi@yCSP;upxl?An
zj{A*WJ5R5l{<yJ>^U2SmJ^R4%|9_v%e$Tv&d;LExp5^!*XiIJ1d|Lik&Bue6*ZFV!
z_viim<#n-r8$yfQ=lA}66uc%jR&MgEPo9r5#iFO)og41F`hKvz)MWWTPcHvYsNS^u
z=ELLj|83u7BUNpzw*NsK(7Zdclke7o68D?KTMc*aJgL8Hs_+Iz``($=v+LhqeQWsB
z)z0%qQ%%tsi+9hDB+ifzpBZyKR)YDsXWohDw#OG9GrTJ?`Ss2}pKK&6ERJ0dw8*MF
z|1sfAP1ID`yT4PfIu>o7tj@Ig(wT0<pDjDBo?Vi-&y*IwDf;HdH@D^*-rRe>+;I2K
z?b4stPfS1MfBa0gZE|1MrskVRL+=&OiR;Vuyl8&>kA>Rw=$(9LKK?e`ux$_L`S5F>
v*WRi5XmEe+uiP_P`6n2`1&rUa;N|~VPtJY8w`!Hxb&!y!tDnm{r-UW|rRW{c

literal 0
HcmV?d00001

diff --git a/tests/TestFiles/Skia/Controls/Border/Border_NonUniform_CornerRadius.expected.png b/tests/TestFiles/Skia/Controls/Border/Border_NonUniform_CornerRadius.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..9deb45aaeb067d61c2774ba50214b80950db4763
GIT binary patch
literal 1084
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yF%}28J29*~C-V}>VM%xNb!1@J
z*w6hZk(Ggg`I)DSV@O5Z+gl4y$Fj;C`&gb7V;~_W*3-?lIB~&(gBuhgdf65q+>kcy
zFDG|cqNB@^1qRKIvk#^P1k6YXh={mRciuvLnjBwM+}`K+&a=z$z32R{`~3I3;`g=s
zK-+-8@5<DtJEpGQd_8^r*}OCB^iNm**#Fn?ciy*;Z)VT=v3`%y@1$=9-)_7)@jaug
zy6ok;v+vH$`}_2J`p>84={vi3R2S%cGWq;ar}0VDS<|Y_PmlQ1e!A`~zB5x*!lLXa
z^SsyJHZQl2ZTg<p&h`Fm+^mCfPy8ljo7X=upKkH#(M@+tM(dItZRS&tuR1*U@!vTO
zb8p#9*t6ea&+~%k3GdDLpM1y+y;pqTUapkKzUL>ppI+9=KViu_n{ARl<L9KG8sdHj
z(;A<2?>lV%WZ&}#Avt0v)<(u@+@ElGWrXO7;?o;X+RGiAep>L{u~`nE{)c>gThy|7
zquPWTUHSd`?hhpE&wg6-Y=4oZ>gs#VYc}5GJ}4Mj8oR#oNYiFj0Sy+WR)+-w93o7O
zP6`1WEL@Eailc%986ZbzIsA+33!kn$r`NRc&n}tuy6zUz*-SqRE$_wj6_{OP`Si1>
zCf)MTy}dhR`2F4gpW@!kzWMm(@?xg4cV{ElJ+Jn!zjfgD<~<MQZ+;C-b!F+(UjO`d
zdA`}FlRElU^=d-jUR}Mp_~zl8y>o7O$!)EhC;LuCZu^bdM?T)xx&DFOa^qH)qVj3+
z6KZWw=e}Bd^I<Q)%;cEqmFFiOUv<Z_=x&{9bzNDe&=LL3&Khae5pt`Go=3<YpZfHN
z|C8BYqc@wU>7W0!Po-SKLhYx<_un`9H~XjCpM_+=b9as&74}<xbj{mLxe}0&r>mdK
II;Vst0D%^uoB#j-

literal 0
HcmV?d00001

diff --git a/tests/TestFiles/Skia/Controls/Border/Border_Uniform_CornerRadius.expected.png b/tests/TestFiles/Skia/Controls/Border/Border_Uniform_CornerRadius.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4bfa75eb8fad329e993f4dde010964fa5572837
GIT binary patch
literal 1307
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yF%}28J29*~C-V}>VM%xNb!1@J
z*w6hZkrl{2>gnPbQW5v|*4n<%bcwda6{{SS1UOilm>m>6yPB7Dc=0V*v<}E;X?!AJ
z!N6k5o5|!UTqSUVi-ogvf`Y)8>KDI+&e-G}x@Ek1+4ZS=A~zg4)A9XWoc(VRpk)jU
z2RKWsEZ03fGb1~>PNF#T%+J&!xoh9@&a6(2>#MYTc5}uY`!K!!N~>poXY?PFd6>e!
zx%=ix<?_5Uiw)=hZ`40_N4B`s$Ii8;YJ>jGwQnNI-kzKB=HBz&Gwz=0lk5Bwn1AdE
zzvou|<1#npnY%Y9%k|6*H@<l>=9~Pg`NwM{Cfh$aIfFa-fyK$a`DMn|vtsw!J_}Ik
z`*Z2c-#HD*Z|=?5xqj!D`>SKZ&iePo7crSVxHd!bWbd3C?RVnORP)W3$vOK+rPBIY
zlHZzKyS1lEWpgg>QLp^-vR?a?@zXyKY$OYu&xNIyKfk<I+j8TyJryVU&n}L+vFS}g
znWgpKu01_7uU4Kvc<t%O{4z`a*<qEPwZ%Sl3HO2yc^cf`@%&}j*SkeIpN<~>k!*SB
z+S%BB`(*gHcq{x|=ly4^OycWjdi5WtB~EuJIxDt*x^m9lJ5NLBop^TCYu)u4?dg-1
zcF&o6F0X#`p9MT~RIJ~A)tesiVZW+?1`AWG!vX;g5vE2bg#Zo~u0{vNQ9-%}$ZnQT
zd6x4c`!<voPk){#pE2DbPWSld(}LUb-hHw^{m~&__{7eq9MR_GKi@yCSP;upxl?An
zj{A*WJ5R5l{<yJ>^U2SmJ^R4%|9_v%e$Tv&d;LExp5^!*XiIJ1d|Lik&Bue6*ZFV!
z_viim<#n-r8$yfQ=lA}66uc%jR&MgEPo9r5#iFO)og41F`hKvz)MWWTPcHvYsNS^u
z=ELLj|83u7BUNpzw*NsK(7Zdclke7o68D?KTMc*aJgL8Hs_+Iz``($=v+LhqeQWsB
z)z0%qQ%%tsi+9hDB+ifzpBZyKR)YDsXWohDw#OG9GrTJ?`Ss2}pKK&6ERJ0dw8*MF
z|1sfAP1ID`yT4PfIu>o7tj@Ig(wT0<pDjDBo?Vi-&y*IwDf;HdH@D^*-rRe>+;I2K
z?b4stPfS1MfBa0gZE|1MrskVRL+=&OiR;Vuyl8&>kA>Rw=$(9LKK?e`ux$_L`S5F>
v*WRi5XmEe+uiP_P`6n2`1&rUa;N|~VPtJY8w`!Hxb&!y!tDnm{r-UW|rRW{c

literal 0
HcmV?d00001


From f63b85f677dbdb07b24be03df303db18bc38fd64 Mon Sep 17 00:00:00 2001
From: Benedikt Schroeder <benedikt.schroeder@outlook.de>
Date: Fri, 6 Apr 2018 11:25:42 +0200
Subject: [PATCH 6/6] Remove comment

---
 src/Avalonia.Controls/Presenters/ContentPresenter.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Avalonia.Controls/Presenters/ContentPresenter.cs b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
index cc6c6f364f..478c68a963 100644
--- a/src/Avalonia.Controls/Presenters/ContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
@@ -371,7 +371,6 @@ namespace Avalonia.Controls.Presenters
             var horizontalContentAlignment = HorizontalContentAlignment;
             var verticalContentAlignment = VerticalContentAlignment;
             var useLayoutRounding = UseLayoutRounding;
-            //Not sure about this part
             var availableSizeMinusMargins = new Size(
                 Math.Max(0, finalSize.Width - padding.Left - padding.Right - borderThickness.Left - borderThickness.Right),
                 Math.Max(0, finalSize.Height - padding.Top - padding.Bottom - borderThickness.Top - borderThickness.Bottom));