diff --git a/haxework/gui/GuiBuilder.hx b/haxework/gui/GuiBuilder.hx index 40b9c6a..65e109f 100755 --- a/haxework/gui/GuiBuilder.hx +++ b/haxework/gui/GuiBuilder.hx @@ -125,7 +125,10 @@ class GuiF { } else if (c == "@") { if (s.charAt(1) == "~") { var a:Array = s.substr(2).split(":"); - value = Assets.getBitmapData(a[1]); + switch (a[0]) { + case "images": value = Assets.getBitmapData(a[1]); + case "layout": value = GuiBuilder.buildFromAssets(a[1], null, links); + } } else { var a:Array = s.substr(1).split(":"); value = Reflect.field(Provider.get(IResources), a[0]).get(a[1]); diff --git a/haxework/gui/ITextView.hx b/haxework/gui/ITextView.hx index b87a970..040613b 100755 --- a/haxework/gui/ITextView.hx +++ b/haxework/gui/ITextView.hx @@ -12,4 +12,5 @@ interface ITextView extends IView { public var fontEmbed(default, set):Bool; public var fontColor(default, set):Int; public var fontSize(default, set):Float; + public var fontBold(default, set):Bool; } diff --git a/haxework/gui/TextView.hx b/haxework/gui/TextView.hx index ac90966..6ce1776 100755 --- a/haxework/gui/TextView.hx +++ b/haxework/gui/TextView.hx @@ -22,6 +22,7 @@ class TextView extends SpriteView implements ITextView { public var fontEmbed(default, set):Bool; public var fontColor(default, set):Int; public var fontSize(default, set):Float; + public var fontBold(default, set):Bool; public var layoutHAlign(default, set):HAlign; public var layoutVAlign(default, set):VAlign; @@ -146,6 +147,15 @@ class TextView extends SpriteView implements ITextView { return fontSize; } + private function set_fontBold(value:Bool):Bool { + if (fontBold != value) { + fontBold = value; + textFormat.bold = fontBold; + invalidate(); + } + return fontBold; + } + private function currentText():String { return _text; } diff --git a/haxework/resources/IResources.hx b/haxework/resources/IResources.hx index 4bde7bd..95ba5d6 100755 --- a/haxework/resources/IResources.hx +++ b/haxework/resources/IResources.hx @@ -11,6 +11,7 @@ interface IResources { public var text(default, null):ResMap; public var float(default, null):ResMap; public var styles(default, null):ResMap; + public var any(default, null):ResMap; public function loadStyles(asset:String):Void; } \ No newline at end of file diff --git a/haxework/resources/Resources.hx b/haxework/resources/Resources.hx index a1400d3..576af1c 100755 --- a/haxework/resources/Resources.hx +++ b/haxework/resources/Resources.hx @@ -54,6 +54,7 @@ class Resources implements IResources { public var text(default, null):ResMap; public var float(default, null):ResMap; public var styles(default, null):ResMap; + public var any(default, null):ResMap; public function new() { image = new ResMap(); @@ -62,6 +63,7 @@ class Resources implements IResources { text = new ResMap(); float = new ResMap(); styles = new ResMap(); + any = new ResMap(); } public function loadStyles(asset:String):Void {