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

FIX: Buttons become boldy in android

Browse Source
This commit is contained in:
vakrilov
2017-06-27 15:55:17 +03:00
parent aa8fb024ad
commit 519dd6374f
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/package.json
View File

@@ -6,10 +6,10 @@
"nativescript": { "nativescript": {
"id": "org.nativescript.apps", "id": "org.nativescript.apps",
"tns-ios": { "tns-ios": {
"version": "2.4.0" "version": "2.5.0"
}, },
"tns-android": { "tns-android": {
"version": "2.4.1" "version": "2.5.0"
} }
}, },
"dependencies": { "dependencies": {

10
tns-core-modules/ui/styling/font.android.ts
View File

@@ -147,14 +147,20 @@ function createTypeface(font: Font): android.graphics.Typeface {
default: default:
result = loadFontFromFile(fonts[i]); result = loadFontFromFile(fonts[i]);
if (fontStyle) { if (result && fontStyle) {
result = android.graphics.Typeface.create(result, fontStyle); result = android.graphics.Typeface.create(result, fontStyle);
} }
break; break;
} }
// Found font!
if (result) {
break;
}
} }
if (fontStyle && !result) { if (!result) {
// fallback to sans-serif font with weight and style
result = android.graphics.Typeface.create("sans-serif" + getFontWeightSuffix(font.fontWeight), fontStyle); result = android.graphics.Typeface.create("sans-serif" + getFontWeightSuffix(font.fontWeight), fontStyle);
} }