summaryrefslogtreecommitdiff
path: root/Xamarin.Forms.Platform.iOS/Renderers/FontExtensions.cs
diff options
context:
space:
mode:
authorJason Smith <jason.smith@xamarin.com>2016-12-09 10:17:27 -0800
committerJason Smith <jason.smith@xamarin.com>2016-12-09 10:17:27 -0800
commit899e2bd591bf33cf99c1db95666f1313ff80565b (patch)
tree5f8712401e45895c8aaf79ce8674f76c7f387967 /Xamarin.Forms.Platform.iOS/Renderers/FontExtensions.cs
parentc4b1c88f506ebf76a2a40f005b45ec9b24e46e1a (diff)
downloadxamarin-forms-899e2bd591bf33cf99c1db95666f1313ff80565b.tar.gz
xamarin-forms-899e2bd591bf33cf99c1db95666f1313ff80565b.tar.bz2
xamarin-forms-899e2bd591bf33cf99c1db95666f1313ff80565b.zip
Revert "Deprecate iOS 8 and earlier (#626)"
This reverts commit c4b1c88f506ebf76a2a40f005b45ec9b24e46e1a.
Diffstat (limited to 'Xamarin.Forms.Platform.iOS/Renderers/FontExtensions.cs')
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/FontExtensions.cs17
1 files changed, 15 insertions, 2 deletions
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/FontExtensions.cs b/Xamarin.Forms.Platform.iOS/Renderers/FontExtensions.cs
index 6a6eb636..ae16c662 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))
+ if (UIFont.FamilyNames.Contains(self.FontFamily) && Forms.IsiOS7OrNewer)
{
var descriptor = new UIFontDescriptor().CreateWithFamily(self.FontFamily);
@@ -67,6 +67,12 @@ 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);
@@ -104,7 +110,7 @@ namespace Xamarin.Forms.Platform.iOS
try
{
UIFont result;
- if (UIFont.FamilyNames.Contains(family))
+ if (UIFont.FamilyNames.Contains(family) && Forms.IsiOS7OrNewer)
{
var descriptor = new UIFontDescriptor().CreateWithFamily(family);
@@ -136,6 +142,13 @@ 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);
}