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

fixes for html5

Browse Source
This commit is contained in:
shmyga
2014-08-13 11:45:14 +04:00
parent d1491d1bd7
commit 26044f4820
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
haxework/gui/IView.hx
View File

@@ -6,16 +6,16 @@ import haxework.gui.skin.ISkin;
import haxework.gui.core.SizeType; import haxework.gui.core.SizeType;
typedef Content = { typedef Content = {
#if flash #if flash L
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 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 mouseEnabled(get,set):Bool; @:optional var mouseEnabled(default,default):Bool;
#end #end
} }

2
haxework/gui/TextView.hx
View File

@@ -34,7 +34,7 @@ class TextView extends SpriteView implements ITextView<Sprite, TextField> {
layoutVAlign = VAlign.NONE; layoutVAlign = VAlign.NONE;
textField = new TextField(); textField = new TextField();
textField.width = 1; textField.width = 1;
textField.height = 1; textField.height = #if html5 25 #else 1 #end;
textField.wordWrap = true; textField.wordWrap = true;
textFormat = textField.defaultTextFormat; textFormat = textField.defaultTextFormat;
textFormat.font = "Arial"; textFormat.font = "Arial";

4
haxework/net/BaseMediaLoader.hx
View File

@@ -48,7 +48,11 @@ class BaseMediaLoader<T> extends BaseLoader<T> {
override private function internalFromBytes(data:ByteArray):Void { override private function internalFromBytes(data:ByteArray):Void {
loader = buildLoader(); loader = buildLoader();
#if flash
loader.loadBytes(data, buildLoaderContext(true)); loader.loadBytes(data, buildLoaderContext(true));
#else
loader.loadBytes(data);
#end
} }
private function buildLoaderContext(bytes:Bool):LoaderContext { private function buildLoaderContext(bytes:Bool):LoaderContext {