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

1. relative to bug #754, FontTest should use "fonts/abc.ttf" as external ttf name 

2. fixed a tiny bug, FontTest can show font name on the top correctly
This commit is contained in:
Walzer 2011-10-20 14:56:39 +08:00
parent 3baf45e923
commit 67bbbb2800
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos2dx/platform/ios/CCImage_ios.mm
View File

@ -338,7 +338,7 @@ static CGSize _caculateStringSizeWithFontOrZFont(NSString *str, id font, CGSize
CGSize tmp;
if (isZfont)
{
[FontLabelStringDrawingHelper sizeWithZFont:str zfont:font];
tmp = [FontLabelStringDrawingHelper sizeWithZFont:str zfont:font];
}
else
{

19
tests/tests/FontTest/FontTest.cpp
View File

@ -9,21 +9,13 @@ enum {
};
static int fontIdx = 0;
static std::string fontList[] =
{
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
static std::string fontList[] =
{
"American Typewriter",
"American Typewriter",
"Marker Felt",
"A Damn Mess",
"Abberancy",
"Abduction",
"Paint Boy",
"Schwarzwald Regular",
"Scissor Cuts",
};
#else
static std::string fontList[] =
{
#endif
"fonts/A Damn Mess.ttf",
"fonts/Abberancy.ttf",
"fonts/Abduction.ttf",
@ -31,7 +23,6 @@ static std::string fontList[] =
"fonts/Schwarzwald Regular.ttf",
"fonts/Scissor Cuts.ttf",
};
#endif
static const char* nextAction(void)
{