Bitmap text fix for CreateJS#823

Author: varyndev

src/easeljs/display/BitmapText.js

@@ -50,8 +50,8 @@ this.createjs = this.createjs || {};
 	 **/
 	function BitmapText(text, spriteSheet) {
 		this.Container_constructor();
-		
-		
+
+
 	// public properties:
 		/**
 		 * The text to display.
@@ -60,7 +60,7 @@ this.createjs = this.createjs || {};
 		 * @default ""
 		 **/
 		this.text = text||"";
-		
+
 		/**
 		 * A SpriteSheet instance that defines the glyphs for this bitmap text. Each glyph/character
 		 * should have a single frame animation defined in the sprite sheet named the same as
@@ -70,7 +70,7 @@ this.createjs = this.createjs || {};
 		 *
 		 * would indicate that the frame at index 0 of the spritesheet should be drawn for the "A" character. The short form
 		 * is also acceptable:
-		 * 
+		 *
 		 * 		"A": 0
 		 *
 		 * Note that if a character in the text is not found in the sprite sheet, it will also
@@ -82,7 +82,7 @@ this.createjs = this.createjs || {};
 		 * @default null
 		 **/
 		this.spriteSheet = spriteSheet;
-	
+
 		/**
 		 * The height of each line of text. If 0, then it will use a line height calculated
 		 * by checking for the height of the "1", "T", or "L" character (in that order). If
@@ -93,15 +93,15 @@ this.createjs = this.createjs || {};
 		 * @default 0
 		 **/
 		this.lineHeight = 0;
-	
+
 		/**
 		 * This spacing (in pixels) will be added after each character in the output.
 		 * @property letterSpacing
 		 * @type Number
 		 * @default 0
 		 **/
 		this.letterSpacing = 0;
-	
+
 		/**
 		 * If a space character is not defined in the sprite sheet, then empty pixels equal to
 		 * spaceWidth will be inserted instead. If 0, then it will use a value calculated
@@ -113,8 +113,8 @@ this.createjs = this.createjs || {};
 		 * @default 0
 		 **/
 		this.spaceWidth = 0;
-		
-		
+
+
 	// private properties:
 	 	/**
 		 * @property _oldProps
@@ -151,7 +151,7 @@ this.createjs = this.createjs || {};
 	 * @default 100
 	 **/
 	BitmapText.maxPoolSize = 100;
-	
+
 	/**
 	 * Sprite object pool.
 	 * @property _spritePool
@@ -161,21 +161,21 @@ this.createjs = this.createjs || {};
 	 */
 	BitmapText._spritePool = [];
 
-	
+
 // public methods:
 	// Docced in superclass
 	p.draw = function(ctx, ignoreCache) {
 		if (this.DisplayObject_draw(ctx, ignoreCache)) { return; }
 		this._updateState();
 		this.Container_draw(ctx, ignoreCache);
 	};
-	
+
 	// Docced in superclass
 	p.getBounds = function() {
 		this._updateText();
 		return this.Container_getBounds();
 	};
-	
+
 	/**
 	 * Returns true or false indicating whether the display object would be visible if drawn to a canvas.
 	 * This does not account for whether it would be visible within the boundaries of the stage.
@@ -187,11 +187,11 @@ this.createjs = this.createjs || {};
 		var hasContent = this.cacheCanvas || (this.spriteSheet && this.spriteSheet.complete && this.text);
 		return !!(this.visible && this.alpha > 0 && this.scaleX !== 0 && this.scaleY !== 0 && hasContent);
 	};
-	
+
 	p.clone = function() {
 		return this._cloneProps(new BitmapText(this.text, this.spriteSheet));
 	};
-	
+
 	/**
 	 * <strong>Disabled in BitmapText.</strong>
 	 * @method addChild
@@ -234,7 +234,7 @@ this.createjs = this.createjs || {};
 		o.spaceWidth = this.spaceWidth;
 		return o;
 	};
-	
+
 	/**
 	 * @method _getFrameIndex
 	 * @param {String} character
@@ -250,7 +250,7 @@ this.createjs = this.createjs || {};
 		}
 		return o && o.frames[0];
 	};
-	
+
 	/**
 	 * @method _getFrame
 	 * @param {String} character
@@ -291,20 +291,20 @@ this.createjs = this.createjs || {};
 	 **/
 	p._updateText = function() {
 		var x=0, y=0, o=this._oldProps, change=false, spaceW=this.spaceWidth, lineH=this.lineHeight, ss=this.spriteSheet;
-		var pool=BitmapText._spritePool, kids=this.children, childIndex=0, numKids=kids.length, sprite;
-		
+		var pool=BitmapText._spritePool, kids=this.children, childIndex=0, numKids=kids.length, sprite, spriteBounds;
+
 		for (var n in o) {
 			if (o[n] != this[n]) {
 				o[n] = this[n];
 				change = true;
 			}
 		}
 		if (!change) { return; }
-		
+
 		var hasSpace = !!this._getFrame(" ", ss);
 		if (!hasSpace && !spaceW) { spaceW = this._getSpaceWidth(ss); }
 		if (!lineH) { lineH = this._getLineHeight(ss); }
-		
+
 		for(var i=0, l=this.text.length; i<l; i++) {
 			var character = this.text.charAt(i);
 			if (character == " " && !hasSpace) {
@@ -319,7 +319,7 @@ this.createjs = this.createjs || {};
 
 			var index = this._getFrameIndex(character, ss);
 			if (index == null) { continue; }
-			
+
 			if (childIndex < numKids) {
 				sprite = kids[childIndex];
 			} else {
@@ -329,11 +329,12 @@ this.createjs = this.createjs || {};
 			}
 			sprite.spriteSheet = ss;
 			sprite.gotoAndStop(index);
-			sprite.x = x;
+			spriteBounds = sprite.getBounds();
+			sprite.x = x - spriteBounds.x;
 			sprite.y = y;
 			childIndex++;
-			
-			x += sprite.getBounds().width + this.letterSpacing;
+
+			x += spriteBounds.width + this.letterSpacing;
 		}
 		while (numKids > childIndex) {
 			 // faster than removeChild.