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

Fix: ios crash when creating font descriptor

Browse Source
This commit is contained in:
vakrilov
2015-06-23 15:40:29 +03:00
parent e83a82e2e2
commit 39afd3cc3e
4 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
text/span.ios.ts
View File

@ -9,8 +9,8 @@ export class Span extends spanCommon.Span {
public updateSpanModifiers(parent: formattedString.FormattedString) { public updateSpanModifiers(parent: formattedString.FormattedString) {
super.updateSpanModifiers(parent); super.updateSpanModifiers(parent);
var realFontFamily = this.fontFamily || (parent ? parent.fontFamily : undefined); var realFontFamily = this.fontFamily || (parent ? parent.fontFamily : undefined);
var realFontSize = this.fontSize || var realFontSize = this.fontSize ||
(parent ? parent.fontSize : undefined) || (parent ? parent.fontSize : undefined) ||
(parent && parent.parent ? parent.parent.style.fontSize : undefined); (parent && parent.parent ? parent.parent.style.fontSize : undefined);
var realFontAttributes = this.fontAttributes || (parent ? parent.fontAttributes : undefined); var realFontAttributes = this.fontAttributes || (parent ? parent.fontAttributes : undefined);
@ -25,10 +25,10 @@ export class Span extends spanCommon.Span {
else { else {
var fontDescriptor = UIFontDescriptor.new(); var fontDescriptor = UIFontDescriptor.new();
var symbolicTraits; var symbolicTraits;
if (realFontAttributes & enums.FontAttributes.Bold) { if (realFontAttributes & enums.FontAttributes.Bold) {
symbolicTraits |= UIFontDescriptorSymbolicTraits.UIFontDescriptorTraitBold; symbolicTraits |= UIFontDescriptorSymbolicTraits.UIFontDescriptorTraitBold;
} }
if (realFontAttributes & enums.FontAttributes.Italic) { if (realFontAttributes & enums.FontAttributes.Italic) {
symbolicTraits |= UIFontDescriptorSymbolicTraits.UIFontDescriptorTraitItalic; symbolicTraits |= UIFontDescriptorSymbolicTraits.UIFontDescriptorTraitItalic;
} }
font = UIFont.fontWithDescriptorSize(fontDescriptor.fontDescriptorWithSymbolicTraits(symbolicTraits), realFontSize); font = UIFont.fontWithDescriptorSize(fontDescriptor.fontDescriptorWithSymbolicTraits(symbolicTraits), realFontSize);
@ -41,7 +41,7 @@ export class Span extends spanCommon.Span {
} }
} }
var realForegroundColor = this.foregroundColor || var realForegroundColor = this.foregroundColor ||
(parent ? parent.foregroundColor : undefined) || (parent ? parent.foregroundColor : undefined) ||
(parent && parent.parent ? parent.parent.style.color : undefined); (parent && parent.parent ? parent.parent.style.color : undefined);
if (realForegroundColor) { if (realForegroundColor) {
@ -51,7 +51,7 @@ export class Span extends spanCommon.Span {
}); });
} }
var realBackgroundColor = this.backgroundColor || var realBackgroundColor = this.backgroundColor ||
(parent ? parent.backgroundColor : undefined) || (parent ? parent.backgroundColor : undefined) ||
(parent && parent.parent ? parent.parent.style.backgroundColor : undefined); (parent && parent.parent ? parent.parent.style.backgroundColor : undefined);
if (realBackgroundColor) { if (realBackgroundColor) {

18
ui/styling/font.android.ts
View File

@ -13,20 +13,14 @@ export class Font extends common.Font {
private _android: android.graphics.Typeface; private _android: android.graphics.Typeface;
get android(): android.graphics.Typeface { get android(): android.graphics.Typeface {
if (!this._android) { if (!this._android) {
var style: number; var style: number = 0;
if (this.isBold) { if (this.isBold) {
if (this.isItalic) { style |= android.graphics.Typeface.BOLD;
style = android.graphics.Typeface.BOLD_ITALIC;
}
else {
style = android.graphics.Typeface.BOLD;
}
} }
else if (this.isItalic) {
style = android.graphics.Typeface.ITALIC; if (this.isItalic) {
} style |= android.graphics.Typeface.ITALIC;
else {
style = android.graphics.Typeface.NORMAL;
} }
var typeFace = this.getTypeFace(this.fontFamily); var typeFace = this.getTypeFace(this.fontFamily);

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

@ -1,5 +1,6 @@
import enums = require("ui/enums"); import enums = require("ui/enums");
import common = require("ui/styling/font-common"); import common = require("ui/styling/font-common");
import utils = require("utils/utils");
var DEFAULT_SERIF = "Times New Roman"; var DEFAULT_SERIF = "Times New Roman";
var DEFAULT_SANS_SERIF = "Helvetica"; var DEFAULT_SANS_SERIF = "Helvetica";
@ -12,21 +13,24 @@ export class Font extends common.Font {
get ios(): UIFontDescriptor { get ios(): UIFontDescriptor {
if (!this._ios) { if (!this._ios) {
var fontFamily = this.getFontFamilyRespectingGenericFonts(this.fontFamily); var fontFamily = this.getFontFamilyRespectingGenericFonts(this.fontFamily);
this._ios = UIFontDescriptor.fontDescriptorWithNameSize(fontFamily, 0);
var symbolicTraits: number = 0;
if (this.isBold) { if (this.isBold) {
if (this.isItalic) { symbolicTraits |= UIFontDescriptorSymbolicTraits.UIFontDescriptorTraitBold;
this._ios = this._ios.fontDescriptorWithSymbolicTraits( }
UIFontDescriptorSymbolicTraits.UIFontDescriptorTraitItalic | if (this.isItalic) {
UIFontDescriptorSymbolicTraits.UIFontDescriptorTraitBold); symbolicTraits |= UIFontDescriptorSymbolicTraits.UIFontDescriptorTraitItalic;
} }
else {
this._ios = this._ios.fontDescriptorWithSymbolicTraits( if (fontFamily) {
UIFontDescriptorSymbolicTraits.UIFontDescriptorTraitBold); this._ios = UIFontDescriptor.fontDescriptorWithNameSize(fontFamily, 0);
if (symbolicTraits) {
this._ios = this._ios.fontDescriptorWithSymbolicTraits(symbolicTraits);
} }
} }
else if (this.isItalic) {
this._ios = this._ios.fontDescriptorWithSymbolicTraits( if(!this._ios) {
UIFontDescriptorSymbolicTraits.UIFontDescriptorTraitItalic); this._ios = UIFontDescriptor.new().fontDescriptorWithSymbolicTraits(symbolicTraits);
} }
} }
return this._ios; return this._ios;

2
utils/utils.ios.ts
View File

@ -39,7 +39,7 @@ export module ios {
export function nsArrayToJSArray(a: any): string[] { export function nsArrayToJSArray(a: any): string[] {
var arr = []; var arr = [];
if ("undefined" !== typeof a) { if ("undefined" !== typeof a) {
for (var i = 0; i < a.count(); i++) { for (var i = 0; i < a.count; i++) {
arr.push(a.objectAtIndex(i)); arr.push(a.objectAtIndex(i));
} }
} }