[W] Button BG Color & BorderRadius are consistent

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

1 files changed, 9 insertions, 1 deletions

diff --git a/Xamarin.Forms.Platform.WinRT/ButtonRenderer.cs b/Xamarin.Forms.Platform.WinRT/ButtonRenderer.cs
index 60ee6418..131e5f9f 100644
--- a/Xamarin.Forms.Platform.WinRT/ButtonRenderer.cs
+++ b/Xamarin.Forms.Platform.WinRT/ButtonRenderer.cs
@@ -88,6 +88,14 @@ namespace Xamarin.Forms.Platform.WinRT
 			}
 		}
 
+		protected override void UpdateBackgroundColor()
+		{
+			// Button is a special case; we don't want to set the Control's background
+			// because it goes outside the bounds of the Border/ContentPresenter, 
+			// which is where we might change the BorderRadius to create a rounded shape.
+			return;
+		}
+
 		void OnButtonClick(object sender, RoutedEventArgs e)
 		{
 			Button buttonView = Element;
@@ -97,7 +105,7 @@ namespace Xamarin.Forms.Platform.WinRT
 
 		void UpdateBackground()
 		{
-			Control.Background = Element.BackgroundColor != Color.Default ? Element.BackgroundColor.ToBrush() : (Brush)Windows.UI.Xaml.Application.Current.Resources["ButtonBackgroundThemeBrush"];
+			Control.BackgroundColor = Element.BackgroundColor != Color.Default ? Element.BackgroundColor.ToBrush() : (Brush)Windows.UI.Xaml.Application.Current.Resources["ButtonBackgroundThemeBrush"];
 		}
 
 		void UpdateBorderColor()