diff options
Diffstat (limited to 'Xamarin.Forms.Platform.iOS/Renderers/FontExtensions.cs')
| -rw-r--r-- | Xamarin.Forms.Platform.iOS/Renderers/FontExtensions.cs | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/FontExtensions.cs b/Xamarin.Forms.Platform.iOS/Renderers/FontExtensions.cs index ae16c662..6a6eb636 100644 --- a/Xamarin.Forms.Platform.iOS/Renderers/FontExtensions.cs +++ b/Xamarin.Forms.Platform.iOS/Renderers/FontExtensions.cs @@ -41,7 +41,7 @@ namespace Xamarin.Forms.Platform.iOS { try { - if (UIFont.FamilyNames.Contains(self.FontFamily) && Forms.IsiOS7OrNewer) + if (UIFont.FamilyNames.Contains(self.FontFamily)) { var descriptor = new UIFontDescriptor().CreateWithFamily(self.FontFamily); @@ -67,12 +67,6 @@ namespace Xamarin.Forms.Platform.iOS } if (bold && italic) { - if (!Forms.IsiOS7OrNewer) - { - // not sure how to make a font both bold and italic in iOS 6, default to bold - return UIFont.BoldSystemFontOfSize(size); - } - var defaultFont = UIFont.SystemFontOfSize(size); var descriptor = defaultFont.FontDescriptor.CreateWithTraits(UIFontDescriptorSymbolicTraits.Bold | UIFontDescriptorSymbolicTraits.Italic); return UIFont.FromDescriptor(descriptor, 0); @@ -110,7 +104,7 @@ namespace Xamarin.Forms.Platform.iOS try { UIFont result; - if (UIFont.FamilyNames.Contains(family) && Forms.IsiOS7OrNewer) + if (UIFont.FamilyNames.Contains(family)) { var descriptor = new UIFontDescriptor().CreateWithFamily(family); @@ -142,13 +136,6 @@ namespace Xamarin.Forms.Platform.iOS if (bold && italic) { var defaultFont = UIFont.SystemFontOfSize(size); - - if (!Forms.IsiOS7OrNewer) - { - // not sure how to make a font both bold and italic in iOS 6, default to bold - return UIFont.BoldSystemFontOfSize(size); - } - var descriptor = defaultFont.FontDescriptor.CreateWithTraits(UIFontDescriptorSymbolicTraits.Bold | UIFontDescriptorSymbolicTraits.Italic); return UIFont.FromDescriptor(descriptor, 0); } |