From 0ccb07ab5e380a817d10a81e45b6b2a975ca3efc Mon Sep 17 00:00:00 2001 From: "Frank A. Krueger" Date: Thu, 9 Nov 2017 17:50:19 -0800 Subject: [PATCH] Only set button borders if needed --- Ooui.Forms/Renderers/ButtonRenderer.cs | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/Ooui.Forms/Renderers/ButtonRenderer.cs b/Ooui.Forms/Renderers/ButtonRenderer.cs index 7989ab1..751e6c7 100644 --- a/Ooui.Forms/Renderers/ButtonRenderer.cs +++ b/Ooui.Forms/Renderers/ButtonRenderer.cs @@ -76,9 +76,24 @@ namespace Ooui.Forms.Renderers if (button.BorderColor != Xamarin.Forms.Color.Default) uiButton.Style.BorderColor = button.BorderColor.ToOouiColor (); + else + uiButton.Style.BorderColor = null; - uiButton.Style.BorderWidth = Math.Max (0f, (float)button.BorderWidth); - uiButton.Style.BorderRadius = button.BorderRadius; + float bw = Math.Max (0f, (float)button.BorderWidth); + if (bw > 0) { + uiButton.Style.BorderWidth = bw + "px"; + } + else { + uiButton.Style.BorderWidth = null; + } + + var br = button.BorderRadius; + if (br > 0 && (bw > 0 || br != 5)) { // 5 is the default + uiButton.Style.BorderRadius = br + "px"; + } + else { + uiButton.Style.BorderRadius = null; + } } void UpdateFont ()