From 66b6f9f482a80f2bd04f9a6dd50852b79932c9b7 Mon Sep 17 00:00:00 2001 From: Mohamed CHOUCHANE Date: Thu, 21 Dec 2017 09:18:07 +0100 Subject: [PATCH] [WPF, GTK, TIZEN] Replace obsolete OutlineColor by BorderColor (#1443) --- Xamarin.Forms.Platform.GTK/Renderers/FrameRenderer.cs | 6 +++--- Xamarin.Forms.Platform.Tizen/Renderers/FrameRenderer.cs | 6 +++--- Xamarin.Forms.Platform.WPF/Renderers/FrameRenderer.cs | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Xamarin.Forms.Platform.GTK/Renderers/FrameRenderer.cs b/Xamarin.Forms.Platform.GTK/Renderers/FrameRenderer.cs index 97d13a4ab..2ba5bf48b 100644 --- a/Xamarin.Forms.Platform.GTK/Renderers/FrameRenderer.cs +++ b/Xamarin.Forms.Platform.GTK/Renderers/FrameRenderer.cs @@ -35,7 +35,7 @@ namespace Xamarin.Forms.Platform.GTK.Renderers PackChild(); } if (e.PropertyName == VisualElement.BackgroundColorProperty.PropertyName || - e.PropertyName == Frame.OutlineColorProperty.PropertyName || + e.PropertyName == Frame.BorderColorProperty.PropertyName || e.PropertyName == Frame.HasShadowProperty.PropertyName) SetupLayer(); } @@ -47,10 +47,10 @@ namespace Xamarin.Forms.Platform.GTK.Renderers else Control.SetBackgroundColor(Element.BackgroundColor.ToGtkColor()); - if (Element.OutlineColor == Color.Default) + if (Element.BorderColor == Color.Default) Control.ResetBorderColor(); else - Control.SetBorderColor(Element.OutlineColor.ToGtkColor()); + Control.SetBorderColor(Element.BorderColor.ToGtkColor()); if (Element.HasShadow) Control.SetShadow(); diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/FrameRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/FrameRenderer.cs index 47bc7033b..8b587e91a 100644 --- a/Xamarin.Forms.Platform.Tizen/Renderers/FrameRenderer.cs +++ b/Xamarin.Forms.Platform.Tizen/Renderers/FrameRenderer.cs @@ -17,7 +17,7 @@ namespace Xamarin.Forms.Platform.Tizen public FrameRenderer() { - RegisterPropertyHandler(Frame.OutlineColorProperty, UpdateColor); + RegisterPropertyHandler(Frame.BorderColorProperty, UpdateColor); RegisterPropertyHandler(Frame.HasShadowProperty, UpdateShadowVisibility); } @@ -105,10 +105,10 @@ namespace Xamarin.Forms.Platform.Tizen void UpdateColor() { - if (Element.OutlineColor.IsDefault) + if (Element.BorderColor.IsDefault) _frame.Color = s_DefaultColor; else - _frame.Color = Element.OutlineColor.ToNative(); + _frame.Color = Element.BorderColor.ToNative(); } void UpdateShadowVisibility() diff --git a/Xamarin.Forms.Platform.WPF/Renderers/FrameRenderer.cs b/Xamarin.Forms.Platform.WPF/Renderers/FrameRenderer.cs index 908f72757..9745e23c7 100644 --- a/Xamarin.Forms.Platform.WPF/Renderers/FrameRenderer.cs +++ b/Xamarin.Forms.Platform.WPF/Renderers/FrameRenderer.cs @@ -37,7 +37,7 @@ namespace Xamarin.Forms.Platform.WPF if (e.PropertyName == Frame.ContentProperty.PropertyName) UpdateContent(); - else if (e.PropertyName == Frame.OutlineColorProperty.PropertyName || e.PropertyName == Frame.HasShadowProperty.PropertyName) + else if (e.PropertyName == Frame.BorderColorProperty.PropertyName || e.PropertyName == Frame.HasShadowProperty.PropertyName) UpdateBorder(); else if (e.PropertyName == Frame.CornerRadiusProperty.PropertyName) UpdateCornerRadius(); @@ -61,9 +61,9 @@ namespace Xamarin.Forms.Platform.WPF void UpdateBorder() { - if (Element.OutlineColor != Color.Default) + if (Element.BorderColor != Color.Default) { - Control.UpdateDependencyColor(Border.BorderBrushProperty, Element.OutlineColor); + Control.UpdateDependencyColor(Border.BorderBrushProperty, Element.BorderColor); Control.BorderThickness = new System.Windows.Thickness(1); } else