Commit: a1799f773946097545bdc7374519e226f5236952 - haxeui-yui (hg)

Commit MetaInfo

• Revisão: a1799f773946097545bdc7374519e226f5236952 (tree)
• Hora: 2022-04-05 04:52:32
• Autor: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@fast...>
• Commiter: Jaime Marquínez Ferrándiz

Mensagem de Log

Use creators defined in nativexml

Mudança Sumário

• modified: demo.hxml
• modified: src/haxe/ui/backend/ComponentImpl.hx
• modified: src/haxe/ui/backend/native.xml
• modified: src/haxe/ui/backend/yui/WidgetWrapper.hx
• modified: src/haxe/ui/backend/yui/behaviours/WidgetLabel.hx
• add: src/haxe/ui/backend/yui/creators/ButtonCreator.hx
• add: src/haxe/ui/backend/yui/creators/Creator.hx
• add: src/haxe/ui/backend/yui/creators/HBoxCreator.hx
• add: src/haxe/ui/backend/yui/creators/LabelCreator.hx
• add: src/haxe/ui/backend/yui/creators/VBoxCreator.hx

Diff

diff -r 3641ad9bc7b6 -r a1799f773946 demo.hxml
--- a/demo.hxml	Wed Mar 30 23:49:22 2022 +0200
+++ b/demo.hxml	Mon Apr 04 21:52:32 2022 +0200
@@ -11,6 +11,7 @@
 --library haxeui-core
 --library haxe-YUI
 
+--dce full
 --cpp bin
 
 --macro haxe.macro.Compiler.include("haxe.ui", ["haxe.ui.macros"])
\ No newline at end of file

diff -r 3641ad9bc7b6 -r a1799f773946 src/haxe/ui/backend/ComponentImpl.hx
--- a/src/haxe/ui/backend/ComponentImpl.hx	Wed Mar 30 23:49:22 2022 +0200
+++ b/src/haxe/ui/backend/ComponentImpl.hx	Mon Apr 04 21:52:32 2022 +0200
@@ -4,21 +4,11 @@
 
 package haxe.ui.backend;
 
-import haxe.ui.backend.yui.DialogWrapper;
+import haxe.ui.backend.yui.creators.Creator;
 import haxe.ui.backend.yui.WidgetWrapper;
-import haxe.ui.components.Button;
-import haxe.ui.components.Label;
-import haxe.ui.containers.HBox;
-import haxe.ui.containers.VBox;
-import haxe.ui.core.TextInput;
 import haxe.ui.core.Component;
-import haxe.ui.events.UIEvent;
 import haxe.ui.events.MouseEvent;
-import yui.hxHelpers.AutoRawPointer;
 import yui.YEvent;
-import yui.YUI;
-import yui.YWidget;
-import yui.YWidgetFactory;
 
 using cpp.Pointer;
 using yui.hxHelpers.YWidgetHelper;
@@ -49,34 +39,38 @@
             parent = Toolkit.screen.mainWindow;
         }
 
-        var factory = YUI.widgetFactory().fromRaw().ref;
-        var rPointer : AutoRawPointer<YWidget> = null;
-        // TODO: use creators defined at native.xml
-        if (this is VBox) {
-            rPointer = factory.createVBox(parent.widget);
-        }
-        else if (this is HBox) {
-            rPointer = factory.createHBox(parent.widget);
+        var creatorClass:String = this.getCreator();
+        if (creatorClass != null) {
+            var creator : Creator = Type.createInstance(Type.resolveClass(creatorClass), [this]);
+            this.wrapper = creator.createWrapper(parent);
         }
-        else if (this is Button) {
-            var b = cast(this, Button);
-            rPointer = factory.createPushButton(parent.widget, b.text);
-        }
-        else if (this is Label) {
-            var l = cast(this, Label);
-            rPointer = factory.createLabel(parent.widget, l.text);
-        }
-
-        if (rPointer != null) {
-            var pointer : cpp.RawPointer<YWidget> = rPointer;
-            this.wrapper = new WidgetWrapper(pointer.fromRaw());
-        } else {
-            trace('pointer not created');
+        else {
+            trace('There is not a creator for ${className}');
         }
 
         parent.children.push(cast(this, Component));
     }
 
+    private function getCreator() {
+        var valueType = Type.typeof(this);
+        switch (valueType) {
+            case TClass(cls):
+                return this.getCreatorClassname(cls);
+            default:
+                return null;
+        } 
+    }
+
+    private function getCreatorClassname(cls : Class<Dynamic>) {
+        var clsName = Type.getClassName(cls);
+        var creatorClass = Toolkit.nativeConfig.query('component[id=${clsName}].@creator', null, this);
+        if (creatorClass != null) {
+            return creatorClass;
+        } else {
+            return this.getCreatorClassname(Type.getSuperClass(cls));
+        }
+    }
+
     public function handleYEvent(eventPointer : Pointer<YEvent>) : Bool {
         var event = eventPointer.ref;
         var widgetPointer = event.widget();

diff -r 3641ad9bc7b6 -r a1799f773946 src/haxe/ui/backend/native.xml
--- a/src/haxe/ui/backend/native.xml	Wed Mar 30 23:49:22 2022 +0200
+++ b/src/haxe/ui/backend/native.xml	Mon Apr 04 21:52:32 2022 +0200
@@ -5,8 +5,12 @@
 -->
 <?xml version="1.0" encoding="utf-8" ?>
 <native>
-    <component id="haxe.ui.components.Button" allowChildren="false">
+    <component id="haxe.ui.components.Button" allowChildren="false" creator="haxe.ui.backend.yui.creators.ButtonCreator">
         <behaviour id="text" class="haxe.ui.backend.yui.behaviours.WidgetLabel" />
         <behaviour id="value" class="haxe.ui.backend.yui.behaviours.WidgetLabel" />
     </component>
+    <component id="haxe.ui.components.Label" allowChildren="false" creator="haxe.ui.backend.yui.creators.LabelCreator" />
+    
+    <component id="haxe.ui.containers.HBox" allowChildren="true" creator="haxe.ui.backend.yui.creators.HBoxCreator" />
+    <component id="haxe.ui.containers.VBox" allowChildren="true" creator="haxe.ui.backend.yui.creators.VBoxCreator" />
 </native>
\ No newline at end of file

diff -r 3641ad9bc7b6 -r a1799f773946 src/haxe/ui/backend/yui/WidgetWrapper.hx
--- a/src/haxe/ui/backend/yui/WidgetWrapper.hx	Wed Mar 30 23:49:22 2022 +0200
+++ b/src/haxe/ui/backend/yui/WidgetWrapper.hx	Mon Apr 04 21:52:32 2022 +0200
@@ -10,7 +10,6 @@
 import yui.YWidget;
 
 using cpp.Pointer;
-using cpp.RawPointer;
 
 /**
  * Wrapper for `YWidget`.
@@ -21,6 +20,12 @@
         this.widget = w;
         this.children = [];
     }
+
+    public static inline function fromPointer<TWidget:YWidget>(widgetPointer : cpp.Pointer<TWidget>) {
+        var ref : cpp.Reference<YWidget> = widgetPointer.ref;
+        return new WidgetWrapper(ref.addressOf());
+    }
+
     public var widget : cpp.Pointer<YWidget>;
 
     public var children : Array<Component>;

diff -r 3641ad9bc7b6 -r a1799f773946 src/haxe/ui/backend/yui/behaviours/WidgetLabel.hx
--- a/src/haxe/ui/backend/yui/behaviours/WidgetLabel.hx	Wed Mar 30 23:49:22 2022 +0200
+++ b/src/haxe/ui/backend/yui/behaviours/WidgetLabel.hx	Mon Apr 04 21:52:32 2022 +0200
@@ -9,6 +9,7 @@
 import yui.YProperty;
 import yui.YPropertyValue;
 
+@:keep
 class WidgetLabel extends DataBehaviour {
     static final LABEL_PROPERTY = "Label";
 

diff -r 3641ad9bc7b6 -r a1799f773946 src/haxe/ui/backend/yui/creators/ButtonCreator.hx
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/haxe/ui/backend/yui/creators/ButtonCreator.hx	Mon Apr 04 21:52:32 2022 +0200
@@ -0,0 +1,21 @@
+// SPDX-FileCopyrightText: 2022 Jaime Marquínez Ferrándiz <[e-mail]>
+//
+// SPDX-License-Identifier: Unlicense
+
+package haxe.ui.backend.yui.creators;
+
+import yui.YWidget;
+
+@:keep
+class ButtonCreator extends Creator {
+    private var _button : haxe.ui.components.Button;
+    function new(button : haxe.ui.components.Button) {
+        super(button);
+        this._button = button;
+    }
+
+    function createWidget(parentWidget : cpp.Pointer<YWidget>) : cpp.Pointer<YWidget> {
+        var p = this.factory.ref.createPushButton(parentWidget, this._button.text);
+        return this.convertPointer(p);
+    }
+}   
\ No newline at end of file

diff -r 3641ad9bc7b6 -r a1799f773946 src/haxe/ui/backend/yui/creators/Creator.hx
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/haxe/ui/backend/yui/creators/Creator.hx	Mon Apr 04 21:52:32 2022 +0200
@@ -0,0 +1,41 @@
+// SPDX-FileCopyrightText: 2022 Jaime Marquínez Ferrándiz <[e-mail]>
+//
+// SPDX-License-Identifier: Unlicense
+
+package haxe.ui.backend.yui.creators;
+
+import haxe.ui.core.Component;
+import yui.YUI;
+import yui.YWidget;
+import yui.YWidgetFactory;
+
+using cpp.Pointer;
+
+abstract class Creator {
+    private var component : Component;
+
+    public function new(comp : Component) {
+        this.component = comp;
+    }
+
+    private var factory (get, never) : cpp.Pointer<YWidgetFactory>;
+    function get_factory() {
+        return YUI.widgetFactory().fromRaw();
+    }
+
+    /**
+     * Create the widget associated to the component
+     * @return The widget
+     */
+    private abstract function createWidget(parentWidget : cpp.Pointer<YWidget>) : cpp.Pointer<YWidget>;
+
+    private inline function convertPointer<T:YWidget>(p : cpp.RawPointer<T>) {
+        var r : cpp.RawPointer<YWidget> = cast p;
+        return r.fromRaw();
+    }
+
+    public function createWrapper(parent : WidgetWrapper) : WidgetWrapper {
+        var widget = this.createWidget(parent.widget);
+        return WidgetWrapper.fromPointer(widget);
+    }
+}
\ No newline at end of file

diff -r 3641ad9bc7b6 -r a1799f773946 src/haxe/ui/backend/yui/creators/HBoxCreator.hx
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/haxe/ui/backend/yui/creators/HBoxCreator.hx	Mon Apr 04 21:52:32 2022 +0200
@@ -0,0 +1,21 @@
+// SPDX-FileCopyrightText: 2022 Jaime Marquínez Ferrándiz <[e-mail]>
+//
+// SPDX-License-Identifier: Unlicense
+
+package haxe.ui.backend.yui.creators;
+
+import yui.YWidget;
+
+@:keep
+class HBoxCreator extends Creator {
+    private var _hbox : haxe.ui.containers.HBox;
+    function new(hbox : haxe.ui.containers.HBox) {
+        super(hbox);
+        this._hbox = hbox;
+    }
+
+    function createWidget(parentWidget : cpp.Pointer<YWidget>) : cpp.Pointer<YWidget> {
+        var p = factory.ref.createHBox(parentWidget);
+        return this.convertPointer(p);
+    }
+}
\ No newline at end of file

diff -r 3641ad9bc7b6 -r a1799f773946 src/haxe/ui/backend/yui/creators/LabelCreator.hx
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/haxe/ui/backend/yui/creators/LabelCreator.hx	Mon Apr 04 21:52:32 2022 +0200
@@ -0,0 +1,21 @@
+// SPDX-FileCopyrightText: 2022 Jaime Marquínez Ferrándiz <[e-mail]>
+//
+// SPDX-License-Identifier: Unlicense
+
+package haxe.ui.backend.yui.creators;
+
+import yui.YWidget;
+
+@:keep
+class LabelCreator extends Creator {
+    private var _label : haxe.ui.components.Label;
+    function new(label : haxe.ui.components.Label) {
+        super(label);
+        this._label = label;
+    }
+
+    function createWidget(parentWidget : cpp.Pointer<YWidget>) : cpp.Pointer<YWidget> {
+        var p = this.factory.ref.createLabel(parentWidget, this._label.text);
+        return this.convertPointer(p);
+    }
+}
\ No newline at end of file

diff -r 3641ad9bc7b6 -r a1799f773946 src/haxe/ui/backend/yui/creators/VBoxCreator.hx
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/haxe/ui/backend/yui/creators/VBoxCreator.hx	Mon Apr 04 21:52:32 2022 +0200
@@ -0,0 +1,21 @@
+// SPDX-FileCopyrightText: 2022 Jaime Marquínez Ferrándiz <[e-mail]>
+//
+// SPDX-License-Identifier: Unlicense
+
+package haxe.ui.backend.yui.creators;
+
+import yui.YWidget;
+
+@:keep
+class VBoxCreator extends Creator {
+    private var _vbox : haxe.ui.containers.VBox;
+    function new(vbox : haxe.ui.containers.VBox) {
+        super(vbox);
+        this._vbox = vbox;
+    }
+
+    function createWidget(parentWidget : cpp.Pointer<YWidget>) : cpp.Pointer<YWidget> {
+        var p = factory.ref.createVBox(parentWidget);
+        return this.convertPointer(p);
+    }
+}
\ No newline at end of file