From 1643283b5d4d3aab100caf9a6c2f599b97548467 Mon Sep 17 00:00:00 2001 From: shmyga Date: Mon, 25 May 2015 14:47:47 +0300 Subject: [PATCH] text view fix --- haxework/gui/IView.hx | 2 ++ haxework/gui/TextView.hx | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/haxework/gui/IView.hx b/haxework/gui/IView.hx index 3001b31..e9749aa 100755 --- a/haxework/gui/IView.hx +++ b/haxework/gui/IView.hx @@ -10,11 +10,13 @@ typedef Content = { var x(default,default):Float; var y(default,default):Float; var visible(default,default):Bool; + var alpha(default,default):Float; @:optional var mouseEnabled(default,default):Bool; #else var x(get,set):Float; var y(get,set):Float; var visible(get,set):Bool; + var alpha(get,set):Float; @:optional var mouseEnabled(default,default):Bool; #end } diff --git a/haxework/gui/TextView.hx b/haxework/gui/TextView.hx index 57194f8..4a6d30d 100755 --- a/haxework/gui/TextView.hx +++ b/haxework/gui/TextView.hx @@ -12,6 +12,8 @@ import flash.text.TextField; class TextView extends SpriteView implements ITextView { + private static var K_HEIGHT = 1.185; + public var textField(default, null):TextField; public var text(get, set):String; private var _text:String; @@ -155,11 +157,11 @@ class TextView extends SpriteView implements ITextView { if (t != null) for (i in 0...t.length) { if (t.charCodeAt(i) == 10) s++; } - _textHeight = textFormat.size * s; + _textHeight = (textFormat.size + 2) * s * K_HEIGHT; _textWidth = width; #else _textWidth = textField.textWidth; - _textHeight = textField.textHeight; + _textHeight = textField.textHeight * K_HEIGHT; #end } @@ -205,7 +207,7 @@ class TextView extends SpriteView implements ITextView { //} else { textField.width = width; - textField.height = _textHeight * 1.185; + textField.height = _textHeight; //#if html5 textField.height = _textHeight; #end textField.x = switch (layoutHAlign) {