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

Merge pull request #514 from linshun/iss724 

fixed #724, different results of CCLabelTTF on android & win32
This commit is contained in:
minggo 2011-09-19 03:13:56 -07:00
parent 55ab2aa708 6d8225b7bd
commit 371d4e646a
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,15 +64,18 @@ public class Cocos2dxBitmap{
TextProperty textProperty = computeTextProperty(content, paint, width, height); TextProperty textProperty = computeTextProperty(content, paint, width, height);
int BitMapTotalHeight = (height == 0 ? textProperty.totalHeight:height);
// Draw text to bitmap // Draw text to bitmap
Bitmap bitmap = Bitmap.createBitmap(textProperty.maxWidth, Bitmap bitmap = Bitmap.createBitmap(textProperty.maxWidth,
textProperty.totalHeight, Bitmap.Config.ARGB_8888); BitMapTotalHeight, Bitmap.Config.ARGB_8888);
Canvas canvas = new Canvas(bitmap); Canvas canvas = new Canvas(bitmap);
// Draw string // Draw string
FontMetricsInt fm = paint.getFontMetricsInt(); FontMetricsInt fm = paint.getFontMetricsInt();
int x = 0; int x = 0;
int y = -fm.ascent; int y = height == 0 ?(-fm.ascent):
(-fm.ascent + (height - textProperty.totalHeight)/2);
String[] lines = textProperty.lines; String[] lines = textProperty.lines;
for (String line : lines){ for (String line : lines){
x = computeX(paint, line, textProperty.maxWidth, alignment); x = computeX(paint, line, textProperty.maxWidth, alignment);

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

@ -64,15 +64,18 @@ public class Cocos2dxBitmap{
TextProperty textProperty = computeTextProperty(content, paint, width, height); TextProperty textProperty = computeTextProperty(content, paint, width, height);
int BitMapTotalHeight = (height == 0 ? textProperty.totalHeight:height);
// Draw text to bitmap // Draw text to bitmap
Bitmap bitmap = Bitmap.createBitmap(textProperty.maxWidth, Bitmap bitmap = Bitmap.createBitmap(textProperty.maxWidth,
textProperty.totalHeight, Bitmap.Config.ARGB_8888); BitMapTotalHeight, Bitmap.Config.ARGB_8888);
Canvas canvas = new Canvas(bitmap); Canvas canvas = new Canvas(bitmap);
// Draw string // Draw string
FontMetricsInt fm = paint.getFontMetricsInt(); FontMetricsInt fm = paint.getFontMetricsInt();
int x = 0; int x = 0;
int y = -fm.ascent; int y = height == 0 ?(-fm.ascent):
(-fm.ascent + (height - textProperty.totalHeight)/2);
String[] lines = textProperty.lines; String[] lines = textProperty.lines;
for (String line : lines){ for (String line : lines){
x = computeX(paint, line, textProperty.maxWidth, alignment); x = computeX(paint, line, textProperty.maxWidth, alignment);

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

@ -64,15 +64,18 @@ public class Cocos2dxBitmap{
TextProperty textProperty = computeTextProperty(content, paint, width, height); TextProperty textProperty = computeTextProperty(content, paint, width, height);
int BitMapTotalHeight = (height == 0 ? textProperty.totalHeight:height);
// Draw text to bitmap // Draw text to bitmap
Bitmap bitmap = Bitmap.createBitmap(textProperty.maxWidth, Bitmap bitmap = Bitmap.createBitmap(textProperty.maxWidth,
textProperty.totalHeight, Bitmap.Config.ARGB_8888); BitMapTotalHeight, Bitmap.Config.ARGB_8888);
Canvas canvas = new Canvas(bitmap); Canvas canvas = new Canvas(bitmap);
// Draw string // Draw string
FontMetricsInt fm = paint.getFontMetricsInt(); FontMetricsInt fm = paint.getFontMetricsInt();
int x = 0; int x = 0;
int y = -fm.ascent; int y = height == 0 ?(-fm.ascent):
(-fm.ascent + (height - textProperty.totalHeight)/2);
String[] lines = textProperty.lines; String[] lines = textProperty.lines;
for (String line : lines){ for (String line : lines){
x = computeX(paint, line, textProperty.maxWidth, alignment); x = computeX(paint, line, textProperty.maxWidth, alignment);