fix #28, bitmap in android size should multipled by content scale factor

stubma · Nov 13, 2013 · f2bac7a · f2bac7a
1 parent b89ce4d
commit f2bac7a
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/cocos2dx-common/java/org/cocos2dx/lib/RichLabelBitmap.java b/cocos2dx-common/java/org/cocos2dx/lib/RichLabelBitmap.java
@@ -329,10 +329,14 @@ public static void createRichLabelBitmap(String pString, final String pFontName,
                     		try {
 								is = am.open(openSpan.imageName);
 								Bitmap bitmap = BitmapFactory.decodeStream(is);
-								if(openSpan.scaleX != 1 || openSpan.scaleY != 1) {
+								if(openSpan.scaleX != 1 || openSpan.scaleY != 1 || contentScaleFactor != 1) {
+									float dstW = openSpan.width != 0 ? (int)openSpan.width : (int)(bitmap.getWidth() * openSpan.scaleX);
+									float dstH = openSpan.height != 0 ? (int)openSpan.height : (int)(bitmap.getHeight() * openSpan.scaleY);
+									dstW *= contentScaleFactor;
+									dstH *= contentScaleFactor;
 									Bitmap scaled = Bitmap.createScaledBitmap(bitmap, 
-											openSpan.width != 0 ? (int)openSpan.width : (int)(bitmap.getWidth() * openSpan.scaleX),
-											openSpan.height != 0 ? (int)openSpan.height : (int)(bitmap.getHeight() * openSpan.scaleY),
+											(int)dstW,
+											(int)dstH,
 											true);
 									bitmap.recycle();
 									bitmap = scaled;
@@ -557,7 +561,7 @@ public static void createRichLabelBitmap(String pString, final String pFontName,
 			c.translate(startX, startY);
 
 			// draw text
-			layout.draw(c);
+            layout.draw(c);
 
 			// draw again if stroke is enabled
 			if(stroke) {