Add childrenChanged() callback to avoid reacting on every child add…

…ed to a component
ImJimmi · Nov 12, 2023 · d432605 · d432605
1 parent e932678
commit d432605
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 10 deletions.
diff --git a/jive_layouts/layout/gui-items/jive_CommonGuiItem.cpp b/jive_layouts/layout/gui-items/jive_CommonGuiItem.cpp
@@ -187,14 +187,6 @@ namespace jive
         enabled = component->isEnabled();
     }
 
-    void CommonGuiItem::componentChildrenChanged(juce::Component& componentThatsChildrenChanged)
-    {
-        if (&componentThatsChildrenChanged != component.get())
-            return;
-
-        getTopLevelDecorator().layOutChildren();
-    }
-
     [[nodiscard]] static auto hasWidgetRole(const juce::Component& component)
     {
         if (auto* handler = const_cast<juce::Component*>(&component)->getAccessibilityHandler())
@@ -264,6 +256,11 @@ namespace jive
                            juce::roundToInt(boxModel.getHeight()));
         getTopLevelDecorator().layOutChildren();
     }
+
+    void CommonGuiItem::childrenChanged()
+    {
+        getTopLevelDecorator().layOutChildren();
+    }
 } // namespace jive
 
 #if JIVE_UNIT_TESTS

diff --git a/jive_layouts/layout/gui-items/jive_CommonGuiItem.h b/jive_layouts/layout/gui-items/jive_CommonGuiItem.h
@@ -18,10 +18,11 @@ namespace jive
         void componentVisibilityChanged(juce::Component& component) override;
         void componentNameChanged(juce::Component& component) override;
         void componentEnablementChanged(juce::Component& component) override;
-        void componentChildrenChanged(juce::Component& component) override;
         void componentParentHierarchyChanged(juce::Component& component) override;
         void boxModelChanged(BoxModel& boxModel) override;
 
+        void childrenChanged() override;
+
     private:
         Property<juce::String> name;
         Property<juce::String> title;

diff --git a/jive_layouts/layout/gui-items/jive_GuiItem.cpp b/jive_layouts/layout/gui-items/jive_GuiItem.cpp
@@ -61,6 +61,11 @@ namespace jive
     }
 
     void GuiItem::insertChild(std::unique_ptr<GuiItem> child, int index)
+    {
+        insertChild(std::move(child), index, true);
+    }
+
+    void GuiItem::insertChild(std::unique_ptr<GuiItem> child, int index, bool invokeCallback)
     {
         if (child == nullptr)
         {
@@ -71,14 +76,19 @@ namespace jive
 
         auto* newlyAddedChild = children.insert(index, std::move(child));
         component->addChildComponent(*newlyAddedChild->getComponent());
+
+        if (invokeCallback)
+            childrenChanged();
     }
 
     void GuiItem::setChildren(std::vector<std::unique_ptr<GuiItem>>&& newChildren)
     {
         children.clearQuick(true);
 
         for (auto& child : newChildren)
-            insertChild(std::move(child), children.size());
+            insertChild(std::move(child), children.size(), false);
+
+        childrenChanged();
     }
 
     void GuiItem::removeChild(GuiItem& childToRemove)

diff --git a/jive_layouts/layout/gui-items/jive_GuiItem.h b/jive_layouts/layout/gui-items/jive_GuiItem.h
@@ -35,6 +35,8 @@ namespace jive
         juce::ValueTree state;
 
     protected:
+        virtual void childrenChanged() {}
+
         const std::shared_ptr<juce::Component> component;
         GuiItem* const parent;
 
@@ -67,6 +69,8 @@ namespace jive
         const StyleSheet::ReferenceCountedPointer styleSheet;
 #endif
 
+        void insertChild(std::unique_ptr<GuiItem> child, int index, bool invokeCallback);
+
         std::unique_ptr<Remover> remover;
 
         JUCE_LEAK_DETECTOR(GuiItem)

diff --git a/jive_layouts/layout/gui-items/jive_GuiItemDecorator.cpp b/jive_layouts/layout/gui-items/jive_GuiItemDecorator.cpp
@@ -13,11 +13,13 @@ namespace jive
     void GuiItemDecorator::insertChild(std::unique_ptr<GuiItem> child, int index)
     {
         item->insertChild(std::move(child), index);
+        childrenChanged();
     }
 
     void GuiItemDecorator::setChildren(std::vector<std::unique_ptr<GuiItem>>&& newChildren)
     {
         item->setChildren(std::move(newChildren));
+        childrenChanged();
     }
 
     void GuiItemDecorator::removeChild(GuiItem& child)