Final textBounds updates.

Author: photonstorm

README.md

@@ -317,7 +317,7 @@ Version 2.4 - "Katar" - in dev
 * When loading a BitmapText you can now specify either an XML file or a JSON file for the font data. This is useful in environments such as Cocoon where you don't have a native XML parser. If you wish to use JSON the formatting should be equal to the result of running a valid XML file through X2JS (thanks @Feenposhleen #1837)
 * Game Objects that have the Health component (such as Sprites) now have a new method: `heal` which adds the given amount to the health property, i.e. is the opposite of `damage` (thanks @stephandesouza #1794)
 * maxHealth is a new property that Game Objects with the Health component receive and works in combination with the `heal` method to ensure a health limit cap.
-* Text.setTextBounds is a rectangular region that allows you to align your text within it, regardless of the number of lines of text or position within the world. For example in an 800x600 sized game if you set the textBounds to be 0,0,800,600 and text alignment to 'left' and vertical alignment to 'bottom' then the text will render in the bottom-right hand corner of the game, regardless of the size of font you're using or the number of lines in the text itself.
+* Text.setTextBounds is a rectangular region that allows you to align your text within it, regardless of the number of lines of text or position within the world. For example in an 800x600 sized game if you set the textBounds to be 0,0,800,600 and text alignment to 'left' and vertical alignment to 'bottom' then the text will render in the bottom-right hand corner of the game, regardless of the size of font you're using or the number of lines in the text itself (thanks @boostermedia for the idea #1824)
 * Text.autoRound allows you to control if the text is allowed to render at sub-pixel coordinates or not. Set to `true` to round the coordinates, often eliminating anti-aliasing from certain font types (#1867)
 * Tiled Image Collection support is now available and has been added to the TilemapParser and Tilemap classes (thanks @asyed94 #1879)
 * Keyboard.addKeys is a practical way to create an object containing user selected hotkeys. For example: `addKeys( [Phaser.Keyboard.W, Phaser.Keyboard.S, Phaser.Keyboard.A, Phaser.Keyboard.D], [ 'up', 'down', 'left', 'right' ] );` would return an object containing the properties `up`, `down`, `left` and `right` that you could poll just like a Phaser.Key object. (thanks @Mourtz #1857)
@@ -414,6 +414,7 @@ Version 2.4 - "Katar" - in dev
 * Setting mute to false on Sound that was never muted caused its volume to be set to zero (thanks @brianbunch #1870)
 * P2.Body.createGroupCallback incorrectly referenced the `_groupCallbackContext` when deleting it (thanks @Langerz82 #1886)
 * When reusing a Tween created with an array of properties the values would get exponentially added to the TweenData internal array each time the tween was re-run (thanks @SBCGames #1747)
+* Reading the dimensions of a Text object would reset its resolution property (thanks @joelika #1717)
 
 ### Deprecated
 

src/gameobjects/Text.js

@@ -80,8 +80,9 @@ Phaser.Text = function (game, x, y, text, style) {
     this.context = this.canvas.getContext('2d');
 
     /**
-     * 
-     * @property {number} resolution - The resolution of the canvas.
+     * The resolution of the canvas used for rendering the Text.
+     * If you change this you need to call `Text.updateText` after doing so.
+     * @property {number} resolution
      * @default
      */
     this.resolution = 1;
@@ -137,8 +138,6 @@ Phaser.Text = function (game, x, y, text, style) {
 
     Phaser.Sprite.call(this, game, x, y, PIXI.Texture.fromCanvas(this.canvas));
 
-    this.texture.trim = new Phaser.Rectangle();
-
     this.setStyle(style);
 
     if (text !== '')
@@ -730,13 +729,15 @@ Phaser.Text.prototype.setText = function (text) {
  *
  * This is especially powerful when you need to align text against specific coordinates in your game, but the actual text dimensions
  * may vary based on font (say for multi-lingual games).
-* 
- * It works by calculating the final position based on the Text.canvas size, which is modified as the text is updated. Some fonts
- * have additional padding around them which you can mitigate by tweaking the Text.padding property.
  *
  * If `Text.wordWrapWidth` is greater than the width of the text bounds it is clamped to match the bounds width.
  *
  * Call this method with no arguments given to reset an existing textBounds.
+ * 
+ * It works by calculating the final position based on the Text.canvas size, which is modified as the text is updated. Some fonts
+ * have additional padding around them which you can mitigate by tweaking the Text.padding property. It then adjusts the `pivot`
+ * property based on the given bounds and canvas size. This means if you need to set the pivot property directly in your game then
+ * you either cannot use `setTextBounds` or you must place the Text object inside another DisplayObject on which you set the pivot.
  *
  * @method Phaser.Text#setTextBounds
  * @param {number} [x] - The x coordinate of the Text Bounds region.
@@ -784,7 +785,6 @@ Phaser.Text.prototype.updateTexture = function () {
 
     var base = this.texture.baseTexture;
     var crop = this.texture.crop;
-    var trim = this.texture.trim;
     var frame = this.texture.frame;
 
     var w = this.canvas.width;
@@ -796,9 +796,6 @@ Phaser.Text.prototype.updateTexture = function () {
     crop.width = w;
     crop.height = h;
 
-    trim.width = w;
-    trim.height = h;
-
     frame.width = w;
     frame.height = h;
 
@@ -832,8 +829,8 @@ Phaser.Text.prototype.updateTexture = function () {
             y = this.textBounds.halfHeight - (this.canvas.height / 2);
         }
 
-        trim.x = x;
-        trim.y = y;
+        this.pivot.x = -x;
+        this.pivot.y = -y;
     }
 
     this.texture.baseTexture.dirty();