瀏覽代碼

more onAdd/onRemove changes

ncannasse 8 年之前
父節點
當前提交
311c8b4cdd
共有 5 個文件被更改,包括 19 次插入19 次删除
  1. 2 2
      h2d/CachedBitmap.hx
  2. 4 4
      h2d/comp/ColorPicker.hx
  3. 5 5
      h2d/comp/Component.hx
  4. 4 4
      h3d/parts/Editor.hx
  5. 4 4
      h3d/scene/CameraController.hx

+ 2 - 2
h2d/CachedBitmap.hx

@@ -22,9 +22,9 @@ class CachedBitmap extends Drawable {
 		}
 	}
 
-	override function onDelete() {
+	override function onRemove() {
 		clean();
-		super.onDelete();
+		super.onRemove();
 	}
 
 	function set_width(w) {

+ 4 - 4
h2d/comp/ColorPicker.hx

@@ -539,16 +539,16 @@ class ColorPicker extends h2d.comp.Component {
 		return v;
 	}
 
-	override function onAlloc() {
-		super.onAlloc();
+	override function onAdd() {
+		super.onAdd();
 		if( timer == null ) {
 			timer = new haxe.Timer(10);
 			timer.run = doUpdate;
 		}
 	}
 
-	override function onDelete() {
-		super.onDelete();
+	override function onRemove() {
+		super.onRemove();
 		if( timer != null ) {
 			timer.stop();
 			timer = null;

+ 5 - 5
h2d/comp/Component.hx

@@ -77,15 +77,15 @@ class Component extends Sprite {
 		return v;
 	}
 
-	override function onDelete() {
+	override function onRemove() {
 		if( parentComponent != null ) {
 			parentComponent.components.remove(this);
 			parentComponent = null;
 		}
-		super.onDelete();
+		super.onRemove();
 	}
 
-	override function onAlloc() {
+	override function onAdd() {
 		// lookup our parent component
 		var old = parentComponent;
 		var p = parent;
@@ -98,14 +98,14 @@ class Component extends Sprite {
 					c.components.push(this);
 				}
 				needRebuild = true;
-				super.onAlloc();
+				super.onAdd();
 				return;
 			}
 			p = p.parent;
 		}
 		if( old != null ) old.components.remove(this);
 		parentComponent = null;
-		super.onAlloc();
+		super.onAdd();
 	}
 
 	public function addCss(cssString) {

+ 4 - 4
h3d/parts/Editor.hx

@@ -185,13 +185,13 @@ class Editor extends h2d.Sprite implements Randomized {
 		emit.clear();
 	}
 
-	override function onAlloc() {
-		super.onAlloc();
+	override function onAdd() {
+		super.onAdd();
 		getScene().addEventListener(onEvent);
 	}
 
-	override function onDelete() {
-		super.onDelete();
+	override function onRemove() {
+		super.onRemove();
 		getScene().addEventListener(onEvent);
 	}
 

+ 4 - 4
h3d/scene/CameraController.hx

@@ -100,8 +100,8 @@ class CameraController extends h3d.scene.Object {
 		curOffset.load(targetOffset);
 	}
 
-	override function onAlloc() {
-		super.onAlloc();
+	override function onAdd() {
+		super.onAdd();
 		scene = getScene();
 		scene.addEventListener(onEvent);
 		if( curOffset.w == 0 )
@@ -111,8 +111,8 @@ class CameraController extends h3d.scene.Object {
 		targetOffset.load(curOffset);
 	}
 
-	override function onDelete() {
-		super.onDelete();
+	override function onRemove() {
+		super.onRemove();
 		scene.removeEventListener(onEvent);
 		scene = null;
 	}