[W] Button BG Color & BorderRadius are consistent

UWP Buttons now respect the BorderRadius.
BackgroundColor no longer extends past the Border.

2 files changed, 79 insertions, 0 deletions

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39853.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39853.cs
new file mode 100644
index 00000000..54f4e3e1
--- /dev/null
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39853.cs
@@ -0,0 +1,78 @@
+using System;
+
+using Xamarin.Forms.CustomAttributes;
+
+namespace Xamarin.Forms.Controls
+{
+	[Preserve(AllMembers = true)]
+	[Issue(IssueTracker.Bugzilla, 39853, "BorderRadius ignored on UWP", PlatformAffected.WinRT)]
+	public class Bugzilla39853 : TestContentPage
+	{
+		public class RoundedButton : Xamarin.Forms.Button
+		{
+			public RoundedButton(int radius)
+			{
+				base.BorderRadius = radius;
+				base.WidthRequest = 2 * radius;
+				base.HeightRequest = 2 * radius;
+				HorizontalOptions = LayoutOptions.Center;
+				VerticalOptions = LayoutOptions.Center;
+				BackgroundColor = Color.Aqua;
+				BorderColor = Color.White;
+				TextColor = Color.Purple;
+				Text = "YAY";
+				Image = new FileImageSource { File = "crimson.jpg" };
+			}
+
+			public new int BorderRadius
+			{
+				get
+				{
+					return base.BorderRadius;
+				}
+
+				set
+				{
+					base.WidthRequest = 2 * value;
+					base.HeightRequest = 2 * value;
+					base.BorderRadius = value;
+				}
+			}
+
+			public new double WidthRequest
+			{
+				get
+				{
+					return base.WidthRequest;
+				}
+
+				set
+				{
+					base.WidthRequest = value;
+					base.HeightRequest = value;
+					base.BorderRadius = ((int)value) / 2;
+				}
+			}
+
+			public new double HeightRequest
+			{
+				get
+				{
+					return base.HeightRequest;
+				}
+
+				set
+				{
+					base.WidthRequest = value;
+					base.HeightRequest = value;
+					base.BorderRadius = ((int)value) / 2;
+				}
+			}
+
+		}
+		protected override void Init()
+		{
+			Content = new RoundedButton(100);
+		}
+	}
+}
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
index 81a6c2e2..bca0e29c 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
@@ -126,6 +126,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla39499.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla39668.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla39829.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Bugzilla39853.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)_Template.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue1028.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue1075.cs" />