uikit->domkit

h2d/uikit/BaseComponents.hx → h2d/domkit/BaseComponents.hx

@@ -1,6 +1,6 @@
-package h2d.uikit;
-import uikit.Property;
-import uikit.CssValue;
+package h2d.domkit;
+import domkit.Property;
+import domkit.CssValue;
 
 class CustomParser extends CssValue.ValueParser {
 
@@ -136,8 +136,8 @@ class CustomParser extends CssValue.ValueParser {
 }
 
 #if !macro
-@:uiComp("object") @:parser(h2d.uikit.BaseComponents.CustomParser)
-class ObjectComp implements uikit.Component.ComponentDecl<h2d.Object> {
+@:uiComp("object") @:parser(h2d.domkit.BaseComponents.CustomParser)
+class ObjectComp implements domkit.Component.ComponentDecl<h2d.Object> {
 
 	@:p(ident) var name : String;
 	@:p var x : Float;
@@ -268,15 +268,15 @@ class ObjectComp implements uikit.Component.ComponentDecl<h2d.Object> {
 	}
 
 	static var init = {
-		uikit.Element.addElement = function(e, parent) (parent.obj : h2d.Object).addChild(e.obj);
-		uikit.Element.removeElement = function(e) (e.obj : h2d.Object).remove();
+		domkit.Element.addElement = function(e, parent) (parent.obj : h2d.Object).addChild(e.obj);
+		domkit.Element.removeElement = function(e) (e.obj : h2d.Object).remove();
 		true;
 	}
 
 }
 
 @:uiComp("drawable")
-class DrawableComp extends ObjectComp implements uikit.Component.ComponentDecl<h2d.Drawable> {
+class DrawableComp extends ObjectComp implements domkit.Component.ComponentDecl<h2d.Drawable> {
 
 	@:p(colorF) var color : h3d.Vector;
 	@:p(auto) var smooth : Null<Bool>;
@@ -288,7 +288,7 @@ class DrawableComp extends ObjectComp implements uikit.Component.ComponentDecl<h
 }
 
 @:uiComp("bitmap")
-class BitmapComp extends DrawableComp implements uikit.Component.ComponentDecl<h2d.Bitmap> {
+class BitmapComp extends DrawableComp implements domkit.Component.ComponentDecl<h2d.Bitmap> {
 
 	@:p(tile) var src : h2d.Tile;
 
@@ -303,7 +303,7 @@ class BitmapComp extends DrawableComp implements uikit.Component.ComponentDecl<h
 }
 
 @:uiComp("text")
-class TextComp extends DrawableComp implements uikit.Component.ComponentDecl<h2d.Text> {
+class TextComp extends DrawableComp implements domkit.Component.ComponentDecl<h2d.Text> {
 
 	@:p var text : String = "";
 	@:p(font) var font : h2d.Font;
@@ -329,7 +329,7 @@ class TextComp extends DrawableComp implements uikit.Component.ComponentDecl<h2d
 
 
 @:uiComp("flow")
-class FlowComp extends DrawableComp implements uikit.Component.ComponentDecl<h2d.Flow> {
+class FlowComp extends DrawableComp implements domkit.Component.ComponentDecl<h2d.Flow> {
 
 	@:p(auto) var width : Null<Int>;
 	@:p(auto) var height : Null<Int>;

h2d/domkit/InitComponents.hx

@@ -0,0 +1,19 @@
+package h2d.domkit;
+import h2d.domkit.BaseComponents.CustomParser;
+
+class InitComponents {
+
+	#if macro
+	public static function initOnce() : Array<haxe.macro.Expr.Field> {
+		if( @:privateAccess domkit.Macros.COMPONENTS.get("object") == null ) {
+			domkit.Macros.registerComponent(macro : h2d.domkit.BaseComponents.ObjectComp);
+			domkit.Macros.registerComponent(macro : h2d.domkit.BaseComponents.DrawableComp);
+			domkit.Macros.registerComponent(macro : h2d.domkit.BaseComponents.FlowComp);
+			domkit.Macros.registerComponent(macro : h2d.domkit.BaseComponents.BitmapComp);
+			domkit.Macros.registerComponent(macro : h2d.domkit.BaseComponents.TextComp);
+		}
+		return null;
+	}
+	#end
+
+}

h2d/domkit/Object.hx

@@ -0,0 +1,5 @@
+package h2d.domkit;
+
+@:autoBuild(h2d.domkit.InitComponents.initOnce())
+interface Object extends domkit.Object {
+}

h2d/uikit/InitComponents.hx

@@ -1,19 +0,0 @@
-package h2d.uikit;
-import h2d.uikit.BaseComponents.CustomParser;
-
-class InitComponents {
-
-	#if macro
-	public static function initOnce() : Array<haxe.macro.Expr.Field> {
-		if( @:privateAccess uikit.Macros.COMPONENTS.get("object") == null ) {
-			uikit.Macros.registerComponent(macro : h2d.uikit.BaseComponents.ObjectComp);
-			uikit.Macros.registerComponent(macro : h2d.uikit.BaseComponents.DrawableComp);
-			uikit.Macros.registerComponent(macro : h2d.uikit.BaseComponents.FlowComp);
-			uikit.Macros.registerComponent(macro : h2d.uikit.BaseComponents.BitmapComp);
-			uikit.Macros.registerComponent(macro : h2d.uikit.BaseComponents.TextComp);
-		}
-		return null;
-	}
-	#end
-
-}

h2d/uikit/Object.hx

@@ -1,5 +0,0 @@
-package h2d.uikit;
-
-@:autoBuild(h2d.uikit.InitComponents.initOnce())
-interface Object extends uikit.Object {
-}

samples/Uikit.hx → samples/Domkit.hx

@@ -1,5 +1,5 @@
 
-class View extends h2d.Flow implements h2d.uikit.Object {
+class View extends h2d.Flow implements h2d.domkit.Object {
 
 	static var SRC =
 	<flow background="#024" padding="20" min-width="200" content-halign={align}>
@@ -13,8 +13,8 @@ class View extends h2d.Flow implements h2d.uikit.Object {
 
 }
 
-//PARAM=-lib uikit
-class Uikit extends hxd.App {
+//PARAM=-lib domkit
+class Domkit extends hxd.App {
 
 	var center : h2d.Flow;
 
@@ -33,7 +33,7 @@ class Uikit extends hxd.App {
 	}
 
 	static function main() {
-		new Uikit();
+		new Domkit();
 	}
 
 }