Update listener_helpers

Yuncong Zhang · Yuncong Zhang · commit 5a5f3eb518b1 · 2019-04-24T12:19:57.000+08:00
diff --git a/Runtime/animation/listener_helpers.mixin.gen.cs b/Runtime/animation/listener_helpers.mixin.gen.cs
@@ -61,8 +61,10 @@ public override void addListener(VoidCallback listener) {
         }
 
         public override void removeListener(VoidCallback listener) {
-            this._listeners.Remove(listener);
-            this.didUnregisterListener();
+            bool removed = this._listeners.Remove(listener);
+            if(removed) {
+                this.didUnregisterListener();
+            }
         }
 
         public void notifyListeners() {
@@ -98,8 +100,10 @@ public override void addListener(VoidCallback listener) {
         }
 
         public override void removeListener(VoidCallback listener) {
-            this._listeners.Remove(listener);
-            this.didUnregisterListener();
+            bool removed = this._listeners.Remove(listener);
+            if(removed) {
+                this.didUnregisterListener();
+            }
         }
 
         public void notifyListeners() {
@@ -136,8 +140,10 @@ public override void addStatusListener(AnimationStatusListener listener) {
         }
 
         public override void removeStatusListener(AnimationStatusListener listener) {
-            this._statusListeners.Remove(listener);
-            this.didUnregisterListener();
+            bool removed = this._statusListeners.Remove(listener);
+            if(removed) {
+                this.didUnregisterListener();
+            }
         }
 
         public void notifyStatusListeners(AnimationStatus status) {
@@ -173,8 +179,10 @@ public override void addStatusListener(AnimationStatusListener listener) {
         }
 
         public override void removeStatusListener(AnimationStatusListener listener) {
-            this._statusListeners.Remove(listener);
-            this.didUnregisterListener();
+            bool removed = this._statusListeners.Remove(listener);
+            if(removed) {
+                this.didUnregisterListener();
+            }
         }
 
         public void notifyStatusListeners(AnimationStatus status) {
@@ -210,8 +218,10 @@ public override void addStatusListener(AnimationStatusListener listener) {
         }
 
         public override void removeStatusListener(AnimationStatusListener listener) {
-            this._statusListeners.Remove(listener);
-            this.didUnregisterListener();
+            bool removed = this._statusListeners.Remove(listener);
+            if(removed) {
+                this.didUnregisterListener();
+            }
         }
 
         public void notifyStatusListeners(AnimationStatus status) {
diff --git a/Runtime/animation/listener_helpers.mixin.njk b/Runtime/animation/listener_helpers.mixin.njk
@@ -62,8 +62,10 @@ namespace Unity.UIWidgets.animation {
         }
 
         public override void removeListener(VoidCallback listener) {
-            this._listeners.Remove(listener);
-            this.didUnregisterListener();
+            bool removed = this._listeners.Remove(listener);
+            if(removed) {
+                this.didUnregisterListener();
+            }
         }
 
         public void notifyListeners() {
@@ -103,8 +105,10 @@ namespace Unity.UIWidgets.animation {
         }
 
         public override void removeStatusListener(AnimationStatusListener listener) {
-            this._statusListeners.Remove(listener);
-            this.didUnregisterListener();
+            bool removed = this._statusListeners.Remove(listener);
+            if(removed) {
+                this.didUnregisterListener();
+            }
         }
 
         public void notifyStatusListeners(AnimationStatus status) {
diff --git a/Runtime/foundation/node.mixin.gen.cs b/Runtime/foundation/node.mixin.gen.cs
@@ -204,8 +204,8 @@ CanonicalMixinDiagnosticableTree _getCanonical() {
         
         static readonly Dictionary<_DependencyList, WeakReference> _canonicalObjects =
             new Dictionary<_DependencyList, WeakReference>();
-
-        public bool pureWidget { get; set; } // pure = false, if canonicalEquals should not be used.
+        
+        public bool pureWidget { get; set; } // if canonicalEquals should not be used.
 
         public override bool Equals(object obj) {
             if (ReferenceEquals(null, obj)) {
diff --git a/Runtime/rendering/object.mixin.gen.cs b/Runtime/rendering/object.mixin.gen.cs
@@ -994,7 +994,7 @@ public int childCount {
             get { return this._childCount; }
         }
 
-        public new bool debugValidateChild(RenderObject child) {
+        public bool debugValidateChild(RenderObject child) {
             D.assert(() => {
                 if (!(child is ChildType)) {
                     throw new UIWidgetsError(

Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,10 @@ public override void addListener(VoidCallback listener) {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`public override void removeListener(VoidCallback listener) {`
`64`		`- this._listeners.Remove(listener);`
`65`		`- this.didUnregisterListener();`
	`64`	`+ bool removed = this._listeners.Remove(listener);`
	`65`	`+ if(removed) {`
	`66`	`+ this.didUnregisterListener();`
	`67`	`+ }`
`66`	`68`	`}`
`67`	`69`
`68`	`70`	`public void notifyListeners() {`
`@@ -98,8 +100,10 @@ public override void addListener(VoidCallback listener) {`
`98`	`100`	`}`
`99`	`101`
`100`	`102`	`public override void removeListener(VoidCallback listener) {`
`101`		`- this._listeners.Remove(listener);`
`102`		`- this.didUnregisterListener();`
	`103`	`+ bool removed = this._listeners.Remove(listener);`
	`104`	`+ if(removed) {`
	`105`	`+ this.didUnregisterListener();`
	`106`	`+ }`
`103`	`107`	`}`
`104`	`108`
`105`	`109`	`public void notifyListeners() {`
`@@ -136,8 +140,10 @@ public override void addStatusListener(AnimationStatusListener listener) {`
`136`	`140`	`}`
`137`	`141`
`138`	`142`	`public override void removeStatusListener(AnimationStatusListener listener) {`
`139`		`- this._statusListeners.Remove(listener);`
`140`		`- this.didUnregisterListener();`
	`143`	`+ bool removed = this._statusListeners.Remove(listener);`
	`144`	`+ if(removed) {`
	`145`	`+ this.didUnregisterListener();`
	`146`	`+ }`
`141`	`147`	`}`
`142`	`148`
`143`	`149`	`public void notifyStatusListeners(AnimationStatus status) {`
`@@ -173,8 +179,10 @@ public override void addStatusListener(AnimationStatusListener listener) {`
`173`	`179`	`}`
`174`	`180`
`175`	`181`	`public override void removeStatusListener(AnimationStatusListener listener) {`
`176`		`- this._statusListeners.Remove(listener);`
`177`		`- this.didUnregisterListener();`
	`182`	`+ bool removed = this._statusListeners.Remove(listener);`
	`183`	`+ if(removed) {`
	`184`	`+ this.didUnregisterListener();`
	`185`	`+ }`
`178`	`186`	`}`
`179`	`187`
`180`	`188`	`public void notifyStatusListeners(AnimationStatus status) {`
`@@ -210,8 +218,10 @@ public override void addStatusListener(AnimationStatusListener listener) {`
`210`	`218`	`}`
`211`	`219`
`212`	`220`	`public override void removeStatusListener(AnimationStatusListener listener) {`
`213`		`- this._statusListeners.Remove(listener);`
`214`		`- this.didUnregisterListener();`
	`221`	`+ bool removed = this._statusListeners.Remove(listener);`
	`222`	`+ if(removed) {`
	`223`	`+ this.didUnregisterListener();`
	`224`	`+ }`
`215`	`225`	`}`
`216`	`226`
`217`	`227`	`public void notifyStatusListeners(AnimationStatus status) {`
Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,10 @@ namespace Unity.UIWidgets.animation {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`public override void removeListener(VoidCallback listener) {`
`65`		`- this._listeners.Remove(listener);`
`66`		`- this.didUnregisterListener();`
	`65`	`+ bool removed = this._listeners.Remove(listener);`
	`66`	`+ if(removed) {`
	`67`	`+ this.didUnregisterListener();`
	`68`	`+ }`
`67`	`69`	`}`
`68`	`70`
`69`	`71`	`public void notifyListeners() {`
`@@ -103,8 +105,10 @@ namespace Unity.UIWidgets.animation {`
`103`	`105`	`}`
`104`	`106`
`105`	`107`	`public override void removeStatusListener(AnimationStatusListener listener) {`
`106`		`- this._statusListeners.Remove(listener);`
`107`		`- this.didUnregisterListener();`
	`108`	`+ bool removed = this._statusListeners.Remove(listener);`
	`109`	`+ if(removed) {`
	`110`	`+ this.didUnregisterListener();`
	`111`	`+ }`
`108`	`112`	`}`
`109`	`113`
`110`	`114`	`public void notifyStatusListeners(AnimationStatus status) {`
Original file line number	Diff line number	Diff line change
`@@ -994,7 +994,7 @@ public int childCount {`
`994`	`994`	`get { return this._childCount; }`
`995`	`995`	`}`
`996`	`996`
`997`		`- public new bool debugValidateChild(RenderObject child) {`
	`997`	`+ public bool debugValidateChild(RenderObject child) {`
`998`	`998`	`D.assert(() => {`
`999`	`999`	`if (!(child is ChildType)) {`
`1000`	`1000`	`throw new UIWidgetsError(`