From 26044f482046548f49a6f9275dd8063d47e491e7 Mon Sep 17 00:00:00 2001 From: shmyga Date: Wed, 13 Aug 2014 11:45:14 +0400 Subject: [PATCH] fixes for html5 --- haxework/gui/IView.hx | 6 +++--- haxework/gui/TextView.hx | 2 +- haxework/net/BaseMediaLoader.hx | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/haxework/gui/IView.hx b/haxework/gui/IView.hx index dc818cc..0ab3c4b 100755 --- a/haxework/gui/IView.hx +++ b/haxework/gui/IView.hx @@ -6,16 +6,16 @@ import haxework.gui.skin.ISkin; import haxework.gui.core.SizeType; typedef Content = { - #if flash + #if flash L var x(default,default):Float; var y(default,default):Float; var visible(default,default):Bool; - var mouseEnabled(default,default):Bool; + @:optional var mouseEnabled(default,default):Bool; #else var x(get,set):Float; var y(get,set):Float; var visible(get,set):Bool; - var mouseEnabled(get,set):Bool; + @:optional var mouseEnabled(default,default):Bool; #end } diff --git a/haxework/gui/TextView.hx b/haxework/gui/TextView.hx index bce5a5f..1c43437 100755 --- a/haxework/gui/TextView.hx +++ b/haxework/gui/TextView.hx @@ -34,7 +34,7 @@ class TextView extends SpriteView implements ITextView { layoutVAlign = VAlign.NONE; textField = new TextField(); textField.width = 1; - textField.height = 1; + textField.height = #if html5 25 #else 1 #end; textField.wordWrap = true; textFormat = textField.defaultTextFormat; textFormat.font = "Arial"; diff --git a/haxework/net/BaseMediaLoader.hx b/haxework/net/BaseMediaLoader.hx index 80a7c29..146fc3c 100755 --- a/haxework/net/BaseMediaLoader.hx +++ b/haxework/net/BaseMediaLoader.hx @@ -48,7 +48,11 @@ class BaseMediaLoader extends BaseLoader { override private function internalFromBytes(data:ByteArray):Void { loader = buildLoader(); + #if flash loader.loadBytes(data, buildLoaderContext(true)); + #else + loader.loadBytes(data); + #end } private function buildLoaderContext(bytes:Bool):LoaderContext {