mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-20 00:02:58 +03:00
Code Issues Projects Releases Packages Wiki Activity

entry font set by name only when font family is set for the element.

Browse source
This commit is contained in:
Kyle Spearrin 2016-07-21 00:20:04 -04:00
parent 596a74b394
commit c2cb5ac7c9
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/iOS/Controls/ExtendedEntryRenderer.cs
View file

@ -106,7 +106,8 @@ namespace Bit.iOS.Controls
private void UpdateFont() private void UpdateFont()
{ {
var pointSize = UIFontDescriptor.PreferredBody.PointSize; var descriptor = UIFontDescriptor.PreferredBody;
var pointSize = descriptor.PointSize;
var size = Element.FontSize; var size = Element.FontSize;
if(size == Device.GetNamedSize(NamedSize.Large, typeof(ExtendedEntry))) if(size == Device.GetNamedSize(NamedSize.Large, typeof(ExtendedEntry)))
@ -122,7 +123,14 @@ namespace Bit.iOS.Controls
pointSize *= .6f; 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) private void SetBorder(ExtendedEntry view)