From c2cb5ac7c9ebf96180ad403308de88742519ab06 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Thu, 21 Jul 2016 00:20:04 -0400 Subject: [PATCH] entry font set by name only when font family is set for the element. --- src/iOS/Controls/ExtendedEntryRenderer.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/iOS/Controls/ExtendedEntryRenderer.cs b/src/iOS/Controls/ExtendedEntryRenderer.cs index 806f6240f..f557ee178 100644 --- a/src/iOS/Controls/ExtendedEntryRenderer.cs +++ b/src/iOS/Controls/ExtendedEntryRenderer.cs @@ -106,7 +106,8 @@ namespace Bit.iOS.Controls private void UpdateFont() { - var pointSize = UIFontDescriptor.PreferredBody.PointSize; + var descriptor = UIFontDescriptor.PreferredBody; + var pointSize = descriptor.PointSize; var size = Element.FontSize; if(size == Device.GetNamedSize(NamedSize.Large, typeof(ExtendedEntry))) @@ -122,7 +123,14 @@ namespace Bit.iOS.Controls pointSize *= .6f; } - Control.Font = UIFont.FromName(Element.FontFamily, pointSize); + if(!string.IsNullOrWhiteSpace(Element.FontFamily)) + { + Control.Font = UIFont.FromName(Element.FontFamily, pointSize); + } + else + { + Control.Font = UIFont.FromDescriptor(descriptor, pointSize); + } } private void SetBorder(ExtendedEntry view)