Revert "CompositeBuilder::removeAllComponents should return a value, …

…nor skip" This reverts commit 4d85073.
haxeui · Oct 7, 2024 · d82e162 · d82e162
1 parent 1cba7e5
commit d82e162
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/haxe/ui/containers/ScrollView.hx b/haxe/ui/containers/ScrollView.hx
@@ -1451,9 +1451,10 @@ class ScrollViewBuilder extends CompositeBuilder {
         return r;
     }
 
-    public override function removeAllComponents(dispose:Bool = true) {
+    public override function removeAllComponents(dispose:Bool = true):Bool {
         _contents.removeAllComponents(dispose);
         checkEmptyContentsComponent();
+        return true;
     }
 
     public override function getComponentIndex(child:Component):Int {

diff --git a/haxe/ui/core/Component.hx b/haxe/ui/core/Component.hx
@@ -740,7 +740,10 @@ class Component extends ComponentImpl
     @:dox(group = "Display tree related properties and methods")
     public function removeAllComponents(dispose:Bool = true) {
         if (_compositeBuilder != null) {
-            _compositeBuilder.removeAllComponents(dispose);
+            var b = _compositeBuilder.removeAllComponents(dispose);
+            if (b == true) {
+                return;
+            }
         }
 
         if (_children != null) {

diff --git a/haxe/ui/core/CompositeBuilder.hx b/haxe/ui/core/CompositeBuilder.hx
@@ -57,7 +57,8 @@ class CompositeBuilder {
         return null;
     }
 
-    public function removeAllComponents(dispose:Bool = true) {
+    public function removeAllComponents(dispose:Bool = true):Bool {
+        return false;
     }
 
     public function getComponentIndex(child:Component):Int {