Add template for adding child with wrapper and alignment (rzNz0819r5)

Neko-Box-Coder · May 7, 2023 · 1ad929c · 1ad929c
1 parent 7c43c1b
commit 1ad929c
Show file tree

Hide file tree

Showing 12 changed files with 107 additions and 64 deletions.
diff --git a/Include/ssGUI/DataClasses/Hierarchy.hpp b/Include/ssGUI/DataClasses/Hierarchy.hpp
@@ -1,6 +1,8 @@
 #ifndef SSGUI_HIERARCHY_H
 #define SSGUI_HIERARCHY_H
 
+#include "ssGUI/Enums/AlignmentHorizontal.hpp"
+#include "ssGUI/Enums/AlignmentVertical.hpp"
 #include "ssGUI/Factory.hpp"
 #include "ssGUI/DataClasses/ObjectsReferences.hpp"
 #include <vector>
@@ -120,6 +122,19 @@ namespace ssGUI
             Hierarchy(Hierarchy const& other);
 
             virtual void NotifyAndRemoveOnObjectDestroyEventCallbackIfExist();
+
+            void AddChild(ssGUI::GUIObject* guiObject, bool compositeChild);
+            void AddChild(  ssGUI::GUIObject* guiObject,  
+                            ssGUI::Enums::AlignmentHorizontal horizontalAlignment,
+                            ssGUI::Enums::AlignmentVertical verticalAlignment,
+                            bool compositeChild);
+
+            void AddChildWithWrapper(ssGUI::GUIObject* guiObject, bool compositeChild);
+
+            void AddChildWithWrapper(   ssGUI::GUIObject* guiObject, 
+                                        ssGUI::Enums::AlignmentHorizontal horizontalAlignment,
+                                        ssGUI::Enums::AlignmentVertical verticalAlignment,
+                                        bool compositeChild);
 
         public:
             Hierarchy();
@@ -147,7 +162,7 @@ namespace ssGUI
                 if(std::is_base_of<ssGUI::GUIObject, T>::value)
                 {
                     auto* guiObject = ssGUI::Factory::Create<T>();
-                    guiObject->SetParent(CurrentObject);
+                    AddChild(guiObject, compositeChild);
                     return guiObject;
                 }
                 else
@@ -157,6 +172,64 @@ namespace ssGUI
                 }
             }
 
+            //function: AddChild
+            //Same as above but with <AdvancedPosition: ssGUI::Extensions::AdvancedPosition> extension added
+            template<typename T>
+            T* AddChild(ssGUI::Enums::AlignmentHorizontal horizontalAlignment,
+                        ssGUI::Enums::AlignmentVertical verticalAlignment, 
+                        bool compositeChild = false)
+            {
+                if(std::is_base_of<ssGUI::GUIObject, T>::value)
+                {
+                    auto* guiObject = ssGUI::Factory::Create<T>();
+                    AddChild(guiObject, horizontalAlignment, verticalAlignment, compositeChild);
+                    return guiObject;
+                }
+                else
+                {
+                    ssGUI_WARNING(ssGUI_DATA_TAG, "You cannot add non GUI object");
+                    return nullptr;
+                }
+            }
+
+            //function: AddChildWithWrapper
+            //Same as <AddChild> but with empty GUI object as a wrapper 
+            template<typename T>
+            T* AddChildWithWrapper(bool compositeChild = false)
+            {
+                if(std::is_base_of<ssGUI::GUIObject, T>::value)
+                {
+                    auto* guiObject = ssGUI::Factory::Create<T>();
+                    AddChildWithWrapper(guiObject, compositeChild);
+                    return guiObject;
+                }
+                else
+                {
+                    ssGUI_WARNING(ssGUI_DATA_TAG, "You cannot add non GUI object");
+                    return nullptr;
+                }
+            }
+
+            //function: AddChildWithWrapper
+            //Same as above but with <AdvancedPosition: ssGUI::Extensions::AdvancedPosition> extension added
+            template<typename T>
+            T* AddChildWithWrapper( ssGUI::Enums::AlignmentHorizontal horizontalAlignment,
+                                    ssGUI::Enums::AlignmentVertical verticalAlignment, 
+                                    bool compositeChild = false)
+            {
+                if(std::is_base_of<ssGUI::GUIObject, T>::value)
+                {
+                    auto* guiObject = ssGUI::Factory::Create<T>();
+                    AddChildWithWrapper(guiObject, horizontalAlignment, verticalAlignment, compositeChild);
+                    return guiObject;
+                }
+                else
+                {
+                    ssGUI_WARNING(ssGUI_DATA_TAG, "You cannot add non GUI object");
+                    return nullptr;
+                }
+            }
+
             //function: IsChildComposite
             //True if the current child (see <FindChild>) belongs to this composite object
             virtual bool IsChildComposite() const;

diff --git a/Include/ssGUI/Extensions/Layout.hpp b/Include/ssGUI/Extensions/Layout.hpp
@@ -273,38 +273,6 @@ namespace Extensions
             //If a GUI Object is excluded, it will be ignored
             virtual void UnexcludeObject(ssGUI::GUIObject* obj);
 
-            //function: AddChildWithWrapper
-            //Add a child to container with wrapper 
-            //
-            //parameters:
-            //child - The child <GUIObject> that you wish to parent to the <GUIObject> this extension has attached to 
-            //
-            //returns:
-            //The wrapper <GUIObject> that contains the *child*.
-            //This will be nullptr if this extension is not attached to a GUI object.
-            virtual ssGUI::GUIObject* AddChildWithWrapper(ssGUI::GUIObject* child);
-
-            /*function: AddChildWithAlignment
-            This is equivilent to:
-            ========================= c++ =========================
-            ssGUI::GUIObject* wrapper = AddChildWithWrapper(child);
-        
-            if(wrapper != nullptr)
-            {
-                if(!child->IsAnyExtensionExist<ssGUI::Extensions::AdvancedPosition>())
-                    child->AddExtension(ssGUI::Factory::Create<ssGUI::Extensions::AdvancedPosition>());
-            
-                ssGUI::Extensions::AdvancedPosition* ap = child->GetAnyExtension<ssGUI::Extensions::AdvancedPosition>();
-            
-                ap->SetHorizontalAlignment(horizontal);
-                ap->SetVerticalAlignment(vertical);
-            }
-            
-            return wrapper;
-            =======================================================
-            */
-            virtual ssGUI::GUIObject* AddChildWithAlignment(ssGUI::GUIObject* child, ssGUI::Enums::AlignmentHorizontal horizontal, ssGUI::Enums::AlignmentVertical vertical);
-
             //function: Internal_OnRecursiveChildAdded
             //(Internal ssGUI function) Listener function when a child is being added
             virtual void Internal_OnRecursiveChildAdded(ssGUI::GUIObject* child);

diff --git a/Src/Examples/CloningExampleV2.cpp → Src/Examples/old/CloningExampleV2.cpp b/Src/Examples/CloningExampleV2.cpp → Src/Examples/old/CloningExampleV2.cpp
diff --git a/Src/Examples/ReadmeExample.cpp → Src/Examples/old/ReadmeExample.cpp b/Src/Examples/ReadmeExample.cpp → Src/Examples/old/ReadmeExample.cpp
diff --git a/Src/Examples/ReadmeExampleV2.cpp → Src/Examples/old/ReadmeExampleV2.cpp b/Src/Examples/ReadmeExampleV2.cpp → Src/Examples/old/ReadmeExampleV2.cpp
diff --git a/Src/Examples/ReadmeExampleV3.cpp → Src/Examples/old/ReadmeExampleV3.cpp b/Src/Examples/ReadmeExampleV3.cpp → Src/Examples/old/ReadmeExampleV3.cpp
diff --git a/Src/Examples/ReadmeExampleV4.cpp → Src/Examples/old/ReadmeExampleV4.cpp b/Src/Examples/ReadmeExampleV4.cpp → Src/Examples/old/ReadmeExampleV4.cpp
diff --git a/Src/Examples/ReadmeExampleV4_5.cpp → Src/Examples/old/ReadmeExampleV4_5.cpp b/Src/Examples/ReadmeExampleV4_5.cpp → Src/Examples/old/ReadmeExampleV4_5.cpp
diff --git a/Src/Examples/ReadmeExampleV5.cpp → Src/Examples/old/ReadmeExampleV5.cpp b/Src/Examples/ReadmeExampleV5.cpp → Src/Examples/old/ReadmeExampleV5.cpp
diff --git a/Src/Examples/ReadmeExampleV6.cpp → Src/Examples/old/ReadmeExampleV6.cpp b/Src/Examples/ReadmeExampleV6.cpp → Src/Examples/old/ReadmeExampleV6.cpp
diff --git a/Src/ssGUI/DataClasses/Hierarchy.cpp b/Src/ssGUI/DataClasses/Hierarchy.cpp
@@ -1,5 +1,6 @@
 #include "ssGUI/DataClasses/Hierarchy.hpp"
 
+#include "ssGUI/Extensions/AdvancedPosition.hpp"
 #include "ssGUI/GUIObjectClasses/GUIObject.hpp"
 #include "ssGUI/DataClasses/EventCallbackManager.hpp"
 #include "ssGUI/DataClasses/Renderer.hpp"
@@ -47,6 +48,38 @@ namespace ssGUI
         }
         ssLOG_FUNC_EXIT();
     }
+
+    void Hierarchy::AddChild(ssGUI::GUIObject* guiObject,bool compositeChild)
+    {
+        guiObject->SetParent(CurrentObject, compositeChild);
+    }
+
+    void Hierarchy::AddChild(   ssGUI::GUIObject* guiObject,  
+                                ssGUI::Enums::AlignmentHorizontal horizontalAlignment,
+                                ssGUI::Enums::AlignmentVertical verticalAlignment,
+                                bool compositeChild)
+    {
+        AddChild(guiObject, compositeChild);
+        auto* ap = guiObject->AddExtension<ssGUI::Extensions::AdvancedPosition>();
+        ap->SetAlignment(horizontalAlignment, verticalAlignment);
+    }
+
+    void Hierarchy::AddChildWithWrapper(ssGUI::GUIObject* guiObject, bool compositeChild)
+    {
+        auto* wrapper = ssGUI::Create<ssGUI::GUIObject>();
+        AddChild(wrapper, compositeChild);
+        wrapper->AddChild(guiObject, compositeChild);
+    }
+
+    void Hierarchy::AddChildWithWrapper(ssGUI::GUIObject* guiObject,  
+                                        ssGUI::Enums::AlignmentHorizontal horizontalAlignment,
+                                        ssGUI::Enums::AlignmentVertical verticalAlignment,
+                                        bool compositeChild)
+    {
+        AddChildWithWrapper(guiObject, compositeChild);
+        auto* ap = guiObject->AddExtension<ssGUI::Extensions::AdvancedPosition>();
+        ap->SetAlignment(horizontalAlignment, verticalAlignment);
+    }
 
     Hierarchy::Hierarchy() :    Parent(-1),
                                 Children(),

diff --git a/Src/ssGUI/Extensions/Layout.cpp b/Src/ssGUI/Extensions/Layout.cpp
@@ -979,37 +979,6 @@ namespace Extensions
         }
     }
 
-    ssGUI::GUIObject* Layout::AddChildWithWrapper(ssGUI::GUIObject* child)
-    {
-        if(Container == nullptr)
-            return nullptr;
-
-        ssGUI::GUIObject* wrapper = ssGUI::Factory::Create<ssGUI::GUIObject>();
-        wrapper->SetParent(Container);
-        wrapper->SetUserCreated(false);
-
-        child->SetParent(wrapper);
-        return wrapper;
-    }
-
-    ssGUI::GUIObject* Layout::AddChildWithAlignment(ssGUI::GUIObject* child, ssGUI::Enums::AlignmentHorizontal horizontal, ssGUI::Enums::AlignmentVertical vertical)
-    {
-        ssGUI::GUIObject* wrapper = AddChildWithWrapper(child);
-
-        if(wrapper != nullptr)
-        {
-            if(!child->IsAnyExtensionExist<ssGUI::Extensions::AdvancedPosition>())
-                child->AddExtension<ssGUI::Extensions::AdvancedPosition>();
-
-            ssGUI::Extensions::AdvancedPosition* ap = child->GetAnyExtension<ssGUI::Extensions::AdvancedPosition>();
-
-            ap->SetHorizontalAlignment(horizontal);
-            ap->SetVerticalAlignment(vertical);
-        }
-
-        return wrapper;
-    }
-
     void Layout::Internal_OnRecursiveChildAdded(ssGUI::GUIObject* child)
     {
         ssLOG_FUNC_ENTRY();