From 1baa673f8a5917713f9baba8d1da71f53742840c Mon Sep 17 00:00:00 2001
From: shmyga <shmyga.z@gmail.com>
Date: Mon, 27 Apr 2015 18:01:10 +0300
Subject: [PATCH] fixes for html5

---
 haxework/gui/ButtonView.hx | 17 +++++++++++++----
 haxework/gui/TextView.hx   |  3 +++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/haxework/gui/ButtonView.hx b/haxework/gui/ButtonView.hx
index 3ad3f6a..8d42969 100755
--- a/haxework/gui/ButtonView.hx
+++ b/haxework/gui/ButtonView.hx
@@ -28,7 +28,11 @@ class ButtonView extends LabelView {
     dispatcher = new Dispatcher<ButtonViewListener<Dynamic>>();
     content.buttonMode = true;
     content.mouseChildren = false;
+    #if js
+    content.addEventListener(MouseEvent.MOUSE_UP, onMouseClick);
+    #else
     content.addEventListener(MouseEvent.CLICK, onMouseClick);
+    #end
     #if !mobile
     content.addEventListener(MouseEvent.MOUSE_OVER, onMouseOver);
     content.addEventListener(MouseEvent.MOUSE_OUT, onMouseOut);
@@ -54,14 +58,18 @@ class ButtonView extends LabelView {
 
   private function onMouseDown(event:MouseEvent):Void {
     downed = true;
-    content.stage.addEventListener(MouseEvent.MOUSE_UP, onMouseUp);
-    invalidate();
+    if (content.stage != null) {
+      content.stage.addEventListener(MouseEvent.MOUSE_UP, onMouseUp);
+      invalidate();
+    }
   }
 
   private function onMouseUp(event:MouseEvent):Void {
     downed = false;
-    content.stage.removeEventListener(MouseEvent.MOUSE_UP, onMouseUp);
-    invalidate();
+    if (content.stage != null) {
+      content.stage.removeEventListener(MouseEvent.MOUSE_UP, onMouseUp);
+      invalidate();
+    }
   }
 
   private function pressCaller(listener:ButtonViewListener<Dynamic>):Void {
@@ -93,6 +101,7 @@ class ButtonView extends LabelView {
   public function dispose():Void {
     dispatcher.removeAllListeners();
     content.removeEventListener(MouseEvent.CLICK, onMouseClick);
+    content.removeEventListener(MouseEvent.MOUSE_UP, onMouseClick);
     content.removeEventListener(MouseEvent.MOUSE_OVER, onMouseOver);
     content.removeEventListener(MouseEvent.MOUSE_OUT, onMouseOut);
     content.removeEventListener(MouseEvent.MOUSE_DOWN, onMouseDown);
diff --git a/haxework/gui/TextView.hx b/haxework/gui/TextView.hx
index d97230d..9a7a48a 100755
--- a/haxework/gui/TextView.hx
+++ b/haxework/gui/TextView.hx
@@ -36,6 +36,8 @@ class TextView extends SpriteView implements ITextView<Sprite, TextField> {
     textField.width = 1;
     textField.height = 1;
     textField.wordWrap = true;
+    //textField.borderColor = 0x00ff00;
+    //textField.border = true;
     textFormat = textField.defaultTextFormat;
     textFormat.font = "Arial";
     textFormat.size = 16;
@@ -146,6 +148,7 @@ class TextView extends SpriteView implements ITextView<Sprite, TextField> {
     if (t != null) textField.text = t;
     textField.setTextFormat(textFormat);
     if (contentSize && !Std.is(skin, ISize)) {
+      #if html5 textField.height = textField.textHeight; #end
       width = textField.width + paddings * 2;
       height = textField.height + paddings * 2;
       textField.x = paddings;