Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2025-02-17 06:28:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2410 from slashman/limitWrappedTextToMaxLines

Browse source 
Add "maxLines" style attribute to Text object.
This commit is contained in:
Richard Davey 2016-04-04 20:44:35 +01:00
commit d3e8509f0e
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/gameobjects/Text.js
View file

@ -34,6 +34,7 @@
* @param {number} [style.strokeThickness=0] - A number that represents the thickness of the stroke. Default is 0 (no stroke).
* @param {boolean} [style.wordWrap=false] - Indicates if word wrap should be used.
* @param {number} [style.wordWrapWidth=100] - The width in pixels at which text will wrap.
* @param {number} [style.maxLines=0] - The maximum number of lines to be shown for wrapped text.
* @param {number} [style.tabs=0] - The size (in pixels) of the tabs, for when text includes tab characters. 0 disables. Can be an array of varying tab sizes, one per tab stop.
*/
Phaser.Text = function (game, x, y, text, style) {
@ -284,6 +285,7 @@ Phaser.Text.prototype.setShadow = function (x, y, color, blur, shadowStroke, sha
* @param {number} [style.strokeThickness=0] - A number that represents the thickness of the stroke. Default is 0 (no stroke).
* @param {boolean} [style.wordWrap=false] - Indicates if word wrap should be used.
* @param {number} [style.wordWrapWidth=100] - The width in pixels at which text will wrap.
* @param {number} [style.maxLines=0] - The maximum number of lines to be shown for wrapped text.
* @param {number|array} [style.tabs=0] - The size (in pixels) of the tabs, for when text includes tab characters. 0 disables. Can be an array of varying tab sizes, one per tab stop.
* @return {Phaser.Text} This Text instance.
*/
@ -300,6 +302,7 @@ Phaser.Text.prototype.setStyle = function (style) {
style.strokeThickness = style.strokeThickness || 0;
style.wordWrap = style.wordWrap || false;
style.wordWrapWidth = style.wordWrapWidth || 100;
style.maxLines = style.maxLines || 0;
style.shadowOffsetX = style.shadowOffsetX || 0;
style.shadowOffsetY = style.shadowOffsetY || 0;
style.shadowColor = style.shadowColor || 'rgba(0,0,0,0)';
@ -371,7 +374,13 @@ Phaser.Text.prototype.updateText = function () {
var maxLineWidth = 0;
var fontProperties = this.determineFontProperties(this.style.font);
for (var i = 0; i < lines.length; i++)
var drawnLines = lines.length;
if (this.style.maxLines > 0 && this.style.maxLines < lines.length)
{
drawnLines = this.style.maxLines;
}
for (var i = 0; i < drawnLines; i++)
{
if (tabs === 0)
{
@ -428,7 +437,7 @@ Phaser.Text.prototype.updateText = function () {
// Calculate text height
var lineHeight = fontProperties.fontSize + this.style.strokeThickness + this.padding.y;
var height = lineHeight * lines.length;
var height = lineHeight * drawnLines;
var lineSpacing = this._lineSpacing;
if (lineSpacing < 0 && Math.abs(lineSpacing) > lineHeight)
@ -439,7 +448,7 @@ Phaser.Text.prototype.updateText = function () {
// Adjust for line spacing
if (lineSpacing !== 0)
{
height += lineSpacing * lines.length;
height += lineSpacing * drawnLines;
}
this.canvas.height = height * this._res;
@ -472,7 +481,7 @@ Phaser.Text.prototype.updateText = function () {
this._charCount = 0;
// Draw text line by line
for (i = 0; i < lines.length; i++)
for (i = 0; i < drawnLines; i++)
{
// Split the line by

1
typescript/phaser.d.ts vendored
View file

@ -4704,6 +4704,7 @@ declare module Phaser {
strokeThickness?: number;
wordWrap?: boolean;
wordWrapWidth?: number;
maxLines?: number;
shadowOffsetX?: number;
shadowOffsetY?: number;
shadowColor?: string;