ComponentBase extends Sprite!!

aW4KeNiNG · aW4KeNiNG · commit 2c61382fa4fb · 2018-09-23T02:08:53.000+02:00
diff --git a/extraParams.hxml b/extraParams.hxml
@@ -0,0 +1,2 @@
+--macro patchTypes("patchHeaps.txt")
+--macro patchTypes("patchHaxeUI.txt")
diff --git a/haxe/ui/backend/ComponentBase.hx b/haxe/ui/backend/ComponentBase.hx
@@ -15,44 +15,41 @@ import haxe.ui.styles.Style;
 import haxe.ui.util.Rectangle;
 import hxd.Cursor;
 
-class ComponentBase {
-    public var sprite(default, null):UISprite;
+class ComponentBase extends UISprite {
     private var _eventMap:Map<String, UIEvent->Void>;
 
     public function new() {
+        super(null);
         _eventMap = new Map<String, UIEvent->Void>();
     }
 
     public function handleCreate(native:Bool) {
-        sprite = new UISprite(null);
     }
 
     private function handlePosition(left:Null<Float>, top:Null<Float>, style:Style) {
         if (left != null) {
-            sprite.x = left;
+            x = left;
         }
 
         if (top != null) {
-            sprite.y = top;
+            y = top;
         }
     }
 
-    private function handleSize(width:Null<Float>, height:Null<Float>, style:Style) {
-        if (width == null || height == null || width <= 0 || height <= 0) {
+    private function handleSize(w:Null<Float>, h:Null<Float>, style:Style) {
+        if (h == null || w == null || w <= 0 || h <= 0) {
             return;
         }
 
-        sprite.width = width;
-        sprite.height = height;
-
-        StyleHelper.apply(sprite, style, sprite.x, sprite.y, width, height);
+        setSize(w, h);
+        StyleHelper.apply(this, style, x, y, __width, __height);
     }
 
     private function handleReady() {
     }
 
     private function handleClipRect(value:Rectangle) {
-        sprite.clipRect = value;
+        clipRect = value;
     }
 
     public function handlePreReposition() {
@@ -62,7 +59,7 @@ class ComponentBase {
     }
 
     private function handleVisibility(show:Bool) {
-        sprite.visible = show;
+        visible = show;
     }
 
     //***********************************************************************************************************
@@ -73,7 +70,7 @@ class ComponentBase {
         if (_textDisplay == null) {
             _textDisplay = new TextDisplay();
             _textDisplay.parentComponent = cast(this, Component);
-            sprite.addChild(_textDisplay.sprite);
+            addChild(_textDisplay.sprite);
         }
         if (text != null) {
             _textDisplay.text = text;
@@ -94,7 +91,7 @@ class ComponentBase {
         if (_textInput == null) {
             _textInput = new TextInput();
             _textInput.parentComponent = cast(this, Component);
-            sprite.addChild(_textInput.sprite);
+            addChild(_textInput.sprite);
         }
         if (text != null) {
             _textInput.text = text;
@@ -117,7 +114,7 @@ class ComponentBase {
     public function createImageDisplay():ImageDisplay {
         if (_imageDisplay == null) {
             _imageDisplay = new ImageDisplay();
-            sprite.addChild(_imageDisplay.sprite);
+            addChild(_imageDisplay.sprite);
         }
         return _imageDisplay;
     }
@@ -140,29 +137,29 @@ class ComponentBase {
     // Display tree
     //***********************************************************************************************************
     private function handleSetComponentIndex(child:Component, index:Int) {
-        sprite.addChildAt(child.sprite, index);
+        addChildAt(child, index);
     }
 
     private function handleAddComponent(child:Component):Component {
-        sprite.addChild(child.sprite);
+        addChild(child);
         return child;
     }
 
     private function handleAddComponentAt(child:Component, index:Int):Component {
-        sprite.addChildAt(child.sprite, index);
+        addChildAt(child, index);
         return child;
     }
 
     private function handleRemoveComponent(child:Component, dispose:Bool = true):Component {
-        sprite.removeChild(child.sprite);
+        removeChild(child);
         //TODO - dispose
         return child;
     }
 
     private function handleRemoveComponentAt(index:Int, dispose:Bool = true):Component {
         var child = cast(this, Component)._children[index];
         if (child != null) {
-            sprite.removeChild(child.sprite);
+            removeChild(child);
 
             //TODO - dispose
         }
@@ -171,23 +168,23 @@ class ComponentBase {
 
     private function applyStyle(style:Style) {
         if (style.cursor != null && style.cursor == "pointer") {
-            sprite.cursor = Cursor.Button;
-        } else if (sprite.cursor != hxd.Cursor.Default) {
-            sprite.cursor = Cursor.Default;
+            cursor = Cursor.Button;
+        } else if (cursor != hxd.Cursor.Default) {
+            cursor = Cursor.Default;
         }
 
         if (style.filter != null) {
             //TODO
         } else {
-            sprite.filter = null;
+            filter = null;
         }
 
         if (style.hidden != null) {
-            sprite.visible = !style.hidden;
+            visible = !style.hidden;
         }
 
         if (style.opacity != null) {
-            sprite.alpha = style.opacity;
+            alpha = style.opacity;
         }
     }
 
@@ -200,9 +197,9 @@ class ComponentBase {
                 | MouseEvent.MOUSE_DOWN | MouseEvent.MOUSE_UP | MouseEvent.MOUSE_WHEEL
                 | MouseEvent.CLICK:
                 if (!_eventMap.exists(type)) {
-                    sprite.interactive = true;
+                    interactive = true;
                     _eventMap.set(type, listener);
-                    Reflect.setProperty(sprite.interactiveObj, EventMapper.HAXEUI_TO_HEAPS.get(type), __onMouseEvent.bind(_, type));
+                    Reflect.setProperty(interactiveObj, EventMapper.HAXEUI_TO_HEAPS.get(type), __onMouseEvent.bind(_, type));
                 }
         }
     }
@@ -213,11 +210,11 @@ class ComponentBase {
             | MouseEvent.MOUSE_DOWN | MouseEvent.MOUSE_UP | MouseEvent.MOUSE_WHEEL
             | MouseEvent.CLICK:
                 _eventMap.remove(type);
-                Reflect.setProperty(sprite.interactiveObj, EventMapper.HAXEUI_TO_HEAPS.get(type), null);
+                Reflect.setProperty(interactiveObj, EventMapper.HAXEUI_TO_HEAPS.get(type), null);
         }
 
         if (Lambda.empty(_eventMap)) {
-            sprite.interactive = false;
+            interactive = false;
         }
     }
 
diff --git a/haxe/ui/backend/ScreenBase.hx b/haxe/ui/backend/ScreenBase.hx
@@ -45,7 +45,7 @@ class ScreenBase {
             if (value.hasTextInput()) {
                 value.getTextInput().focus();
             } else {
-                value.sprite.focus();
+                value.setFocus();
             }
         }
 
@@ -78,15 +78,15 @@ class ScreenBase {
     }
 
     public function addComponent(component:Component) {
-        app.s2d.addChildAt(component.sprite, 0);//TODO
+        app.s2d.addChildAt(component, 0);//TODO
     }
 
     public function removeComponent(component:Component) {
-        app.s2d.removeChild(component.sprite);
+        app.s2d.removeChild(component);
     }
 
     private function handleSetComponentIndex(child:Component, index:Int) {
-        app.s2d.addChildAt(child.sprite, index);
+        app.s2d.addChildAt(child, index);
     }
 
     //***********************************************************************************************************
diff --git a/haxe/ui/backend/heaps/UISprite.hx b/haxe/ui/backend/heaps/UISprite.hx
@@ -8,46 +8,15 @@ import hxd.Cursor;
 
 class UISprite extends Graphics
 {
-    public var width(get, set):Float;
-    public var height(get, set):Float;
     public var interactive(default, set):Bool = false;
     public var interactiveObj(default, null):Interactive;
     public var clipRect:Rectangle;
     public var cursor(default, set):Cursor = Cursor.Default;
 
     private var _backgrounds:Map<String, IBackground>;
 
-    private var _width:Float = 0;
-    private function set_width(value:Float):Float {
-        if (_width != value) {
-            _width = value;
-
-            if (interactiveObj != null) {
-                interactiveObj.width = value;
-            }
-        }
-
-        return value;
-    }
-    private function get_width():Float {
-        return _width;
-    }
-
-    private var _height:Float = 0;
-    private function set_height(value:Float):Float {
-        if (_height != value) {
-            _height = value;
-
-            if (interactiveObj != null) {
-                interactiveObj.height = value;
-            }
-        }
-
-        return value;
-    }
-    private function get_height():Float {
-        return _height;
-    }
+    private var __width:Float = 0;
+    private var __height:Float = 0;
 
     private function set_interactive(value:Bool):Bool {
         if (interactive != value) {
@@ -72,11 +41,20 @@ class UISprite extends Graphics
         super(parent);
     }
 
+    public function setSize(w:Float, h:Float) {
+        __width = w;
+        __height = h;
+        if (interactiveObj != null) {
+            interactiveObj.width = w;
+            interactiveObj.height = h;
+        }
+    }
+
     public function hasFocus():Bool {
         return interactiveObj != null && interactiveObj.hasFocus();
     }
 
-    public function focus() {
+    public function setFocus() {
         if (interactiveObj != null) {
             interactiveObj.focus();
         }
@@ -133,7 +111,7 @@ class UISprite extends Graphics
         else {
             super.getBoundsRec(relativeTo, out, forSize);
             if (forSize) {
-                addBounds(relativeTo, out, 0, 0, width, height);
+                addBounds(relativeTo, out, 0, 0, __width, __height);
             }
         }
     }
@@ -195,7 +173,7 @@ class UISprite extends Graphics
     private function checkInteraction() {
         if (interactive || cursor != Cursor.Default) {
             if (interactiveObj == null) {
-                interactiveObj = new Interactive(width, height, this);
+                interactiveObj = new Interactive(__width, __height, this);
                 interactiveObj.propagateEvents = !interactive;
             }
         } else if (interactiveObj == null) {
diff --git a/haxe/ui/backend/macros/HaxeUIMacros.hx b/haxe/ui/backend/macros/HaxeUIMacros.hx
@@ -0,0 +1,30 @@
+package haxe.ui.backend.macros;
+
+import haxe.macro.Expr;
+
+class HaxeUIMacros {
+    macro public static function buildComponent():Array<Field> {
+        var pos = haxe.macro.Context.currentPos();
+        var fields:Array<Field> = haxe.macro.Context.getBuildFields();
+
+        var i:Int = fields.length;
+        while(--i >= 0) {
+            var f:Field = fields[i];
+            switch(f.name) {
+                case "color":
+                    fields.remove(f);
+            }
+        }
+
+        return fields;
+    }
+
+    /*static private function replaceWithCode(f:Field, code:String) {
+        var e:Expr = haxe.macro.Context.parseInlineString(code, f.pos);
+        var fn = switch (e).expr {
+            case EFunction(_, f): f;
+            case _: throw "false";
+        }
+        f.kind = FFun(fn);
+    }*/
+}
diff --git a/haxe/ui/backend/macros/HeapsMacros.hx b/haxe/ui/backend/macros/HeapsMacros.hx
@@ -0,0 +1,19 @@
+package haxe.ui.backend.macros;
+
+import haxe.macro.Expr;
+
+class HeapsMacros {
+    macro public static function removeInline(propNames:Array<String>):Array<Field> {
+        var pos = haxe.macro.Context.currentPos();
+        var fields:Array<Field> = haxe.macro.Context.getBuildFields();
+
+        for(f in fields)
+        {
+            if(propNames.indexOf(f.name) != -1){
+                f.access = [APrivate];
+            }
+        }
+
+        return fields;
+    }
+}
diff --git a/patchHaxeUI.txt b/patchHaxeUI.txt
@@ -0,0 +1 @@
+@:build(haxe.ui.backend.macros.HaxeUIMacros.buildComponent()) haxe.ui.core.Component
diff --git a/patchHeaps.txt b/patchHeaps.txt
@@ -0,0 +1 @@
+@:build(haxe.ui.backend.macros.HeapsMacros.removeInline(["set_x", "set_y"])) h2d.Sprite

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+--macro patchTypes("patchHeaps.txt")`
	`2`	`+--macro patchTypes("patchHaxeUI.txt")`
Original file line number	Diff line number	Diff line change
`@@ -15,44 +15,41 @@ import haxe.ui.styles.Style;`
`15`	`15`	`import haxe.ui.util.Rectangle;`
`16`	`16`	`import hxd.Cursor;`
`17`	`17`
`18`		`-class ComponentBase {`
`19`		`- public var sprite(default, null):UISprite;`
	`18`	`+class ComponentBase extends UISprite {`
`20`	`19`	`private var _eventMap:Map<String, UIEvent->Void>;`
`21`	`20`
`22`	`21`	`public function new() {`
	`22`	`+ super(null);`
`23`	`23`	`_eventMap = new Map<String, UIEvent->Void>();`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public function handleCreate(native:Bool) {`
`27`		`- sprite = new UISprite(null);`
`28`	`27`	`}`
`29`	`28`
`30`	`29`	`private function handlePosition(left:Null<Float>, top:Null<Float>, style:Style) {`
`31`	`30`	`if (left != null) {`
`32`		`- sprite.x = left;`
	`31`	`+ x = left;`
`33`	`32`	`}`
`34`	`33`
`35`	`34`	`if (top != null) {`
`36`		`- sprite.y = top;`
	`35`	`+ y = top;`
`37`	`36`	`}`
`38`	`37`	`}`
`39`	`38`
`40`		`- private function handleSize(width:Null<Float>, height:Null<Float>, style:Style) {`
`41`		`- if (width == null \|\| height == null \|\| width <= 0 \|\| height <= 0) {`
	`39`	`+ private function handleSize(w:Null<Float>, h:Null<Float>, style:Style) {`
	`40`	`+ if (h == null \|\| w == null \|\| w <= 0 \|\| h <= 0) {`
`42`	`41`	`return;`
`43`	`42`	`}`
`44`	`43`
`45`		`- sprite.width = width;`
`46`		`- sprite.height = height;`
`47`		`-`
`48`		`- StyleHelper.apply(sprite, style, sprite.x, sprite.y, width, height);`
	`44`	`+ setSize(w, h);`
	`45`	`+ StyleHelper.apply(this, style, x, y, __width, __height);`
`49`	`46`	`}`
`50`	`47`
`51`	`48`	`private function handleReady() {`
`52`	`49`	`}`
`53`	`50`
`54`	`51`	`private function handleClipRect(value:Rectangle) {`
`55`		`- sprite.clipRect = value;`
	`52`	`+ clipRect = value;`
`56`	`53`	`}`
`57`	`54`
`58`	`55`	`public function handlePreReposition() {`
`@@ -62,7 +59,7 @@ class ComponentBase {`
`62`	`59`	`}`
`63`	`60`
`64`	`61`	`private function handleVisibility(show:Bool) {`
`65`		`- sprite.visible = show;`
	`62`	`+ visible = show;`
`66`	`63`	`}`
`67`	`64`
`68`	`65`	`//***********************************************************************************************************`
`@@ -73,7 +70,7 @@ class ComponentBase {`
`73`	`70`	`if (_textDisplay == null) {`
`74`	`71`	`_textDisplay = new TextDisplay();`
`75`	`72`	`_textDisplay.parentComponent = cast(this, Component);`
`76`		`- sprite.addChild(_textDisplay.sprite);`
	`73`	`+ addChild(_textDisplay.sprite);`
`77`	`74`	`}`
`78`	`75`	`if (text != null) {`
`79`	`76`	`_textDisplay.text = text;`
`@@ -94,7 +91,7 @@ class ComponentBase {`
`94`	`91`	`if (_textInput == null) {`
`95`	`92`	`_textInput = new TextInput();`
`96`	`93`	`_textInput.parentComponent = cast(this, Component);`
`97`		`- sprite.addChild(_textInput.sprite);`
	`94`	`+ addChild(_textInput.sprite);`
`98`	`95`	`}`
`99`	`96`	`if (text != null) {`
`100`	`97`	`_textInput.text = text;`
`@@ -117,7 +114,7 @@ class ComponentBase {`
`117`	`114`	`public function createImageDisplay():ImageDisplay {`
`118`	`115`	`if (_imageDisplay == null) {`
`119`	`116`	`_imageDisplay = new ImageDisplay();`
`120`		`- sprite.addChild(_imageDisplay.sprite);`
	`117`	`+ addChild(_imageDisplay.sprite);`
`121`	`118`	`}`
`122`	`119`	`return _imageDisplay;`
`123`	`120`	`}`
`@@ -140,29 +137,29 @@ class ComponentBase {`
`140`	`137`	`// Display tree`
`141`	`138`	`//***********************************************************************************************************`
`142`	`139`	`private function handleSetComponentIndex(child:Component, index:Int) {`
`143`		`- sprite.addChildAt(child.sprite, index);`
	`140`	`+ addChildAt(child, index);`
`144`	`141`	`}`
`145`	`142`
`146`	`143`	`private function handleAddComponent(child:Component):Component {`
`147`		`- sprite.addChild(child.sprite);`
	`144`	`+ addChild(child);`
`148`	`145`	`return child;`
`149`	`146`	`}`
`150`	`147`
`151`	`148`	`private function handleAddComponentAt(child:Component, index:Int):Component {`
`152`		`- sprite.addChildAt(child.sprite, index);`
	`149`	`+ addChildAt(child, index);`
`153`	`150`	`return child;`
`154`	`151`	`}`
`155`	`152`
`156`	`153`	`private function handleRemoveComponent(child:Component, dispose:Bool = true):Component {`
`157`		`- sprite.removeChild(child.sprite);`
	`154`	`+ removeChild(child);`
`158`	`155`	`//TODO - dispose`
`159`	`156`	`return child;`
`160`	`157`	`}`
`161`	`158`
`162`	`159`	`private function handleRemoveComponentAt(index:Int, dispose:Bool = true):Component {`
`163`	`160`	`var child = cast(this, Component)._children[index];`
`164`	`161`	`if (child != null) {`
`165`		`- sprite.removeChild(child.sprite);`
	`162`	`+ removeChild(child);`
`166`	`163`
`167`	`164`	`//TODO - dispose`
`168`	`165`	`}`
`@@ -171,23 +168,23 @@ class ComponentBase {`
`171`	`168`
`172`	`169`	`private function applyStyle(style:Style) {`
`173`	`170`	`if (style.cursor != null && style.cursor == "pointer") {`
`174`		`- sprite.cursor = Cursor.Button;`
`175`		`- } else if (sprite.cursor != hxd.Cursor.Default) {`
`176`		`- sprite.cursor = Cursor.Default;`
	`171`	`+ cursor = Cursor.Button;`
	`172`	`+ } else if (cursor != hxd.Cursor.Default) {`
	`173`	`+ cursor = Cursor.Default;`
`177`	`174`	`}`
`178`	`175`
`179`	`176`	`if (style.filter != null) {`
`180`	`177`	`//TODO`
`181`	`178`	`} else {`
`182`		`- sprite.filter = null;`
	`179`	`+ filter = null;`
`183`	`180`	`}`
`184`	`181`
`185`	`182`	`if (style.hidden != null) {`
`186`		`- sprite.visible = !style.hidden;`
	`183`	`+ visible = !style.hidden;`
`187`	`184`	`}`
`188`	`185`
`189`	`186`	`if (style.opacity != null) {`
`190`		`- sprite.alpha = style.opacity;`
	`187`	`+ alpha = style.opacity;`
`191`	`188`	`}`
`192`	`189`	`}`
`193`	`190`
`@@ -200,9 +197,9 @@ class ComponentBase {`
`200`	`197`	`\| MouseEvent.MOUSE_DOWN \| MouseEvent.MOUSE_UP \| MouseEvent.MOUSE_WHEEL`
`201`	`198`	`\| MouseEvent.CLICK:`
`202`	`199`	`if (!_eventMap.exists(type)) {`
`203`		`- sprite.interactive = true;`
	`200`	`+ interactive = true;`
`204`	`201`	`_eventMap.set(type, listener);`
`205`		`- Reflect.setProperty(sprite.interactiveObj, EventMapper.HAXEUI_TO_HEAPS.get(type), __onMouseEvent.bind(_, type));`
	`202`	`+ Reflect.setProperty(interactiveObj, EventMapper.HAXEUI_TO_HEAPS.get(type), __onMouseEvent.bind(_, type));`
`206`	`203`	`}`
`207`	`204`	`}`
`208`	`205`	`}`
`@@ -213,11 +210,11 @@ class ComponentBase {`
`213`	`210`	`\| MouseEvent.MOUSE_DOWN \| MouseEvent.MOUSE_UP \| MouseEvent.MOUSE_WHEEL`
`214`	`211`	`\| MouseEvent.CLICK:`
`215`	`212`	`_eventMap.remove(type);`
`216`		`- Reflect.setProperty(sprite.interactiveObj, EventMapper.HAXEUI_TO_HEAPS.get(type), null);`
	`213`	`+ Reflect.setProperty(interactiveObj, EventMapper.HAXEUI_TO_HEAPS.get(type), null);`
`217`	`214`	`}`
`218`	`215`
`219`	`216`	`if (Lambda.empty(_eventMap)) {`
`220`		`- sprite.interactive = false;`
	`217`	`+ interactive = false;`
`221`	`218`	`}`
`222`	`219`	`}`
`223`	`220`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ class ScreenBase {`
`45`	`45`	`if (value.hasTextInput()) {`
`46`	`46`	`value.getTextInput().focus();`
`47`	`47`	`} else {`
`48`		`- value.sprite.focus();`
	`48`	`+ value.setFocus();`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
`@@ -78,15 +78,15 @@ class ScreenBase {`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`public function addComponent(component:Component) {`
`81`		`- app.s2d.addChildAt(component.sprite, 0);//TODO`
	`81`	`+ app.s2d.addChildAt(component, 0);//TODO`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`public function removeComponent(component:Component) {`
`85`		`- app.s2d.removeChild(component.sprite);`
	`85`	`+ app.s2d.removeChild(component);`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`private function handleSetComponentIndex(child:Component, index:Int) {`
`89`		`- app.s2d.addChildAt(child.sprite, index);`
	`89`	`+ app.s2d.addChildAt(child, index);`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`//***********************************************************************************************************`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+@:build(haxe.ui.backend.macros.HaxeUIMacros.buildComponent()) haxe.ui.core.Component`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+@:build(haxe.ui.backend.macros.HeapsMacros.removeInline(["set_x", "set_y"])) h2d.Sprite`