Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15919 from zilongshanren/fix-android-system-fontname 

fix system font creation on Android platform
This commit is contained in:
minggo 2016-06-22 18:10:13 +08:00 committed by GitHub
parent e1e522bd53 8366983a01
commit 324931a242
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/platform/android/CCDevice-android.cpp
View File

@ -114,7 +114,7 @@ public:
int count = strlen(text); int count = strlen(text);
jbyteArray strArray = methodInfo.env->NewByteArray(count); jbyteArray strArray = methodInfo.env->NewByteArray(count);
methodInfo.env->SetByteArrayRegion(strArray, 0, count, reinterpret_cast<const jbyte*>(text)); methodInfo.env->SetByteArrayRegion(strArray, 0, count, reinterpret_cast<const jbyte*>(text));
jstring jstrFont = methodInfo.env->NewStringUTF(fullPathOrFontName.c_str()); jstring jstrFont = methodInfo.env->NewStringUTF(fullPathOrFontName.empty() ? textDefinition._fontName.c_str() : fullPathOrFontName.c_str());
if(!methodInfo.env->CallStaticBooleanMethod(methodInfo.classID, methodInfo.methodID, strArray, if(!methodInfo.env->CallStaticBooleanMethod(methodInfo.classID, methodInfo.methodID, strArray,
jstrFont, textDefinition._fontSize, textDefinition._fontFillColor.r, textDefinition._fontFillColor.g, jstrFont, textDefinition._fontSize, textDefinition._fontFillColor.r, textDefinition._fontFillColor.g,

2
tests/cpp-tests/Resources/ccs-res

@ -1 +1 @@
Subproject commit fab8c569a8f27a2ff7c1150c22507d727efe5c17 Subproject commit 50f82c2e0736d127e0b58fef0d8b773af90a7f3d

2
tests/js-tests/src/FontTest/FontTest.js
View File

@ -33,6 +33,8 @@ var fontIdx = 0;
var fontList = [ var fontList = [
// System Fonts // System Fonts
"sans-serif",
"sans-serif-light",
"Verdana", "Verdana",
"Lucida Sans Unicode", "Lucida Sans Unicode",
"Bookman Old Style", "Bookman Old Style",