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

Merge pull request #329 from minggo/master 

Fix some bug
This commit is contained in:
minggo 2011-06-27 18:23:26 -07:00
parent 7099b24ccb 5e15545dbd
commit e8853583df
4 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
HelloLua/android/src/org/cocos2dx/lib/Cocos2dxBitmap.java
View File

@ -22,6 +22,11 @@ public class Cocos2dxBitmap{
public static void createTextBitmap(String content, String fontName, public static void createTextBitmap(String content, String fontName,
int fontSize, int alignment){ int fontSize, int alignment){
// avoid error when content is ""
if (content.compareTo("") == 0){
content = " ";
}
Paint paint = newPaint(fontName, fontSize, alignment); Paint paint = newPaint(fontName, fontSize, alignment);
TextProperty textProperty = getTextWidthAndHeight(content, paint); TextProperty textProperty = getTextWidthAndHeight(content, paint);

5
HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxBitmap.java
View File

@ -22,6 +22,11 @@ public class Cocos2dxBitmap{
public static void createTextBitmap(String content, String fontName, public static void createTextBitmap(String content, String fontName,
int fontSize, int alignment){ int fontSize, int alignment){
// avoid error when content is ""
if (content.compareTo("") == 0){
content = " ";
}
Paint paint = newPaint(fontName, fontSize, alignment); Paint paint = newPaint(fontName, fontSize, alignment);
TextProperty textProperty = getTextWidthAndHeight(content, paint); TextProperty textProperty = getTextWidthAndHeight(content, paint);

5
tests/test.android/src/org/cocos2dx/lib/Cocos2dxBitmap.java
View File

@ -22,6 +22,11 @@ public class Cocos2dxBitmap{
public static void createTextBitmap(String content, String fontName, public static void createTextBitmap(String content, String fontName,
int fontSize, int alignment){ int fontSize, int alignment){
// avoid error when content is ""
if (content.compareTo("") == 0){
content = " ";
}
Paint paint = newPaint(fontName, fontSize, alignment); Paint paint = newPaint(fontName, fontSize, alignment);
TextProperty textProperty = getTextWidthAndHeight(content, paint); TextProperty textProperty = getTextWidthAndHeight(content, paint);

2
tests/tests/ParallaxTest/ParallaxTest.cpp
View File

@ -72,7 +72,7 @@ Parallax1::Parallax1()
std::string Parallax1::title() std::string Parallax1::title()
{ {
return "MotionStreak test (tap screen)"; return "Parallax: parent and 3 children";
} }
//------------------------------------------------------------------ //------------------------------------------------------------------