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

Merge pull request #2019 from NativeScript/bold-italic-android

Browse Source 
Fix: Bold and italic do not work on Android when no font family
This commit is contained in:
Rossen Hristov
2016-04-22 17:12:36 +03:00
parent 6b2990d8d2 2a2ddb3495
commit 053d7201e2
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,16 @@ export class Font extends common.Font {
public getAndroidTypeface(): android.graphics.Typeface { public getAndroidTypeface(): android.graphics.Typeface {
if (!this._typeface) { if (!this._typeface) {
this._typeface = createTypeface(this); var fontStyle = 0;
if (this.isBold) {
fontStyle |= android.graphics.Typeface.BOLD;
}
if (this.isItalic) {
fontStyle |= android.graphics.Typeface.ITALIC;
}
var typeFace = createTypeface(this);
this._typeface = android.graphics.Typeface.create(typeFace, fontStyle);
} }
return this._typeface; return this._typeface;
} }
@ -116,15 +125,6 @@ function loadFontFromFile(fontFamily: string): android.graphics.Typeface {
function createTypeface(font: Font): android.graphics.Typeface { function createTypeface(font: Font): android.graphics.Typeface {
//http://stackoverflow.com/questions/19691530/valid-values-for-androidfontfamily-and-what-they-map-to //http://stackoverflow.com/questions/19691530/valid-values-for-androidfontfamily-and-what-they-map-to
var fontStyle = 0;
if (font.isBold) {
fontStyle |= android.graphics.Typeface.BOLD;
}
if (font.isItalic) {
fontStyle |= android.graphics.Typeface.ITALIC;
}
var fonts = common.parseFontFamily(font.fontFamily); var fonts = common.parseFontFamily(font.fontFamily);
var result = null; var result = null;
if (fonts.length === 0) { if (fonts.length === 0) {
@ -134,16 +134,16 @@ function createTypeface(font: Font): android.graphics.Typeface {
for (var i = 0; i < fonts.length; i++) { for (var i = 0; i < fonts.length; i++) {
switch (fonts[i].toLowerCase()) { switch (fonts[i].toLowerCase()) {
case common.genericFontFamilies.serif: case common.genericFontFamilies.serif:
result = android.graphics.Typeface.create("serif" + getFontWeightSuffix(font.fontWeight), fontStyle); result = android.graphics.Typeface.create("serif" + getFontWeightSuffix(font.fontWeight), 0);
break; break;
case common.genericFontFamilies.sansSerif: case common.genericFontFamilies.sansSerif:
case common.genericFontFamilies.system: case common.genericFontFamilies.system:
result = android.graphics.Typeface.create("sans-serif" + getFontWeightSuffix(font.fontWeight), fontStyle); result = android.graphics.Typeface.create("sans-serif" + getFontWeightSuffix(font.fontWeight), 0);
break; break;
case common.genericFontFamilies.monospace: case common.genericFontFamilies.monospace:
result = android.graphics.Typeface.create("monospace" + getFontWeightSuffix(font.fontWeight), fontStyle); result = android.graphics.Typeface.create("monospace" + getFontWeightSuffix(font.fontWeight), 0);
break; break;
default: default: