fixes for html5
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ class TextView extends SpriteView implements ITextView<Sprite, TextField> {
|
||||
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";
|
||||
|
||||
@@ -48,7 +48,11 @@ class BaseMediaLoader<T> extends BaseLoader<T> {
|
||||
|
||||
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 {
|
||||
|
||||
Reference in New Issue
Block a user