InfernalGames/haxework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

text view fix

Browse Source
This commit is contained in:
shmyga
2015-05-25 14:47:47 +03:00
parent 28b94b7470
commit 1643283b5d
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
haxework/gui/IView.hx
View File

@@ -10,11 +10,13 @@ typedef Content = {
var x(default,default):Float; var x(default,default):Float;
var y(default,default):Float; var y(default,default):Float;
var visible(default,default):Bool; var visible(default,default):Bool;
var alpha(default,default):Float;
@:optional var mouseEnabled(default,default):Bool; @:optional var mouseEnabled(default,default):Bool;
#else #else
var x(get,set):Float; var x(get,set):Float;
var y(get,set):Float; var y(get,set):Float;
var visible(get,set):Bool; var visible(get,set):Bool;
var alpha(get,set):Float;
@:optional var mouseEnabled(default,default):Bool; @:optional var mouseEnabled(default,default):Bool;
#end #end
} }

8
haxework/gui/TextView.hx
View File

@@ -12,6 +12,8 @@ import flash.text.TextField;
class TextView extends SpriteView implements ITextView<Sprite, TextField> { class TextView extends SpriteView implements ITextView<Sprite, TextField> {
private static var K_HEIGHT = 1.185;
public var textField(default, null):TextField; public var textField(default, null):TextField;
public var text(get, set):String; public var text(get, set):String;
private var _text:String; private var _text:String;
@@ -155,11 +157,11 @@ class TextView extends SpriteView implements ITextView<Sprite, TextField> {
if (t != null) for (i in 0...t.length) { if (t != null) for (i in 0...t.length) {
if (t.charCodeAt(i) == 10) s++; if (t.charCodeAt(i) == 10) s++;
} }
_textHeight = textFormat.size * s; _textHeight = (textFormat.size + 2) * s * K_HEIGHT;
_textWidth = width; _textWidth = width;
#else #else
_textWidth = textField.textWidth; _textWidth = textField.textWidth;
_textHeight = textField.textHeight; _textHeight = textField.textHeight * K_HEIGHT;
#end #end
} }
@@ -205,7 +207,7 @@ class TextView extends SpriteView implements ITextView<Sprite, TextField> {
//} else { //} else {
textField.width = width; textField.width = width;
textField.height = _textHeight * 1.185; textField.height = _textHeight;
//#if html5 textField.height = _textHeight; #end //#if html5 textField.height = _textHeight; #end
textField.x = switch (layoutHAlign) { textField.x = switch (layoutHAlign) {