added lineSpacing

h2d/Text.hx

@@ -13,14 +13,15 @@ class Text extends Drawable {
 	public var textColor(default, set) : Int;
 	public var maxWidth(default, set) : Null<Float>;
 	public var dropShadow : { dx : Float, dy : Float, color : Int, alpha : Float };
-	
+
 	public var textWidth(get, null) : Int;
 	public var textHeight(get, null) : Int;
 	public var textAlign(default, set) : Align;
-	public var letterSpacing(default,set) : Int;
-	
+	public var letterSpacing(default, set) : Int;
+	public var lineSpacing(default,set) : Int;
+
 	var glyphs : TileGroup;
-	
+
 	public function new( font : Font, ?parent ) {
 		super(parent);
 		this.font = font;
@@ -29,7 +30,7 @@ class Text extends Drawable {
 		text = "";
 		textColor = 0xFFFFFF;
 	}
-	
+
 	function set_font(font) {
 		this.font = font;
 		if( glyphs != null ) glyphs.remove();
@@ -38,7 +39,7 @@ class Text extends Drawable {
 		rebuild();
 		return font;
 	}
-	
+
 	function set_textAlign(a) {
 		textAlign = a;
 		rebuild();
@@ -50,12 +51,18 @@ class Text extends Drawable {
 		rebuild();
 		return s;
 	}
-	
+
+	function set_lineSpacing(s) {
+		lineSpacing = s;
+		rebuild();
+		return s;
+	}
+
 	override function onAlloc() {
 		super.onAlloc();
 		rebuild();
 	}
-	
+
 	override function draw(ctx:RenderContext) {
 		glyphs.blendMode = blendMode;
 		if( dropShadow != null ) {
@@ -72,7 +79,7 @@ class Text extends Drawable {
 		}
 		super.draw(ctx);
 	}
-	
+
 	function set_text(t) {
 		var t = t == null ? "null" : t;
 		if( t == this.text ) return t;
@@ -80,11 +87,11 @@ class Text extends Drawable {
 		rebuild();
 		return t;
 	}
-	
+
 	function rebuild() {
 		if( allocated && text != null && font != null ) initGlyphs(text);
 	}
-	
+
 	public function calcTextWidth( text : String ) {
 		return initGlyphs(text,false).width;
 	}
@@ -104,6 +111,7 @@ class Text extends Drawable {
 			x = lines.shift();
 		default:
 		}
+		var dl = font.lineHeight + lineSpacing;
 		var calcLines = !rebuild && lines != null;
 		for( i in 0...text.length ) {
 			var cc = text.charCodeAt(i);
@@ -143,29 +151,29 @@ class Text extends Drawable {
 					}
 				else
 					x = 0;
-				y += font.lineHeight;
+				y += dl;
 				prevChar = -1;
 			} else
 				prevChar = cc;
 		}
 		if( calcLines ) lines.push(x);
-		return { width : x > xMax ? x : xMax, height : x > 0 ? y + font.lineHeight : y > 0 ? y : font.lineHeight };
+		return { width : x > xMax ? x : xMax, height : x > 0 ? y + dl : y > 0 ? y : dl };
 	}
-	
+
 	function get_textHeight() {
 		return initGlyphs(text,false).height;
 	}
-	
+
 	function get_textWidth() {
 		return initGlyphs(text,false).width;
 	}
-	
+
 	function set_maxWidth(w) {
 		maxWidth = w;
 		rebuild();
 		return w;
 	}
-	
+
 	function set_textColor(c) {
 		this.textColor = c;
 		glyphs.color = h3d.Vector.fromColor(c);