javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #663 from NativeScript/PeterStaev-master

Browse Source 
replaced the use of fontDescriptorWithSymbolicTraits due to problems in iOS 8+.
This commit is contained in:
Nedyalko Nikolov
2015-09-04 10:18:40 +03:00
parent 727caca960 d0f4f36018
commit cb92b88641
7 changed files with 73 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ui/styling/font.ios.ts
View File

@@ -87,10 +87,25 @@ function resolveFontDescriptor(fontFamilyValue: string, symbolicTraits: number):
var fontFamily = getFontFamilyRespectingGenericFonts(fonts[i]);
if (systemFontFamilies.has(fontFamily)) {
// This is a font family - we should apply symbolic traits if there are such
result = UIFontDescriptor.fontDescriptorWithNameSize(fontFamily, 0);
if (symbolicTraits) {
result = result.fontDescriptorWithSymbolicTraits(symbolicTraits);
var fontFaceAttribute = "";
if (!symbolicTraits) {
fontFaceAttribute = "Regular";
}
else {
if (symbolicTraits & UIFontDescriptorSymbolicTraits.UIFontDescriptorTraitBold) {
fontFaceAttribute += " Bold";
}
if (symbolicTraits & UIFontDescriptorSymbolicTraits.UIFontDescriptorTraitItalic) {
fontFaceAttribute += " Italic";
}
}
var fontAttributes = NSMutableDictionary.alloc().init();
fontAttributes.setObjectForKey(fontFamily, "NSFontFamilyAttribute");
fontAttributes.setObjectForKey(fontFaceAttribute.trim(), "NSFontFaceAttribute");
result = UIFontDescriptor.fontDescriptorWithFontAttributes(fontAttributes);
}
else if (systemFonts.has(fontFamily)) {
// This is an actual font - don't apply symbolic traits
@@ -128,6 +143,9 @@ function getFontFamilyRespectingGenericFonts(fontFamily: string): string {
export module ios {
export function registerFont(fontFile: string) {
var filePath = fs.path.join(fs.knownFolders.currentApp().path, "fonts", fontFile);
if (!fs.File.exists(filePath)) {
filePath = fs.path.join(fs.knownFolders.currentApp().path, fontFile);
}
var fontData = NSFileManager.defaultManager().contentsAtPath(filePath);
if (!fontData) {
throw new Error("Could not load font from: " + fontFile);
@@ -139,9 +157,9 @@ export module ios {
throw new Error("Could not load font from: " + fontFile);
}
var error = NSError.alloc().init();
var error = new interop.Reference();
if (!CTFontManagerRegisterGraphicsFont(font, error)) {
throw new Error(error.localizedDescription);
throw new Error(CFErrorCopyDescription(<NSError>error.value));
}
areSystemFontSetsValid = false;