Merge pull request Neko-Box-Coder#27 from Neko-Box-Coder/ExtensionsUp…

…date Extensions Update
alecmus · Oct 25, 2023 · e51eca9 · e51eca9
2 parents cb30630 + 2c64a38
commit e51eca9
Show file tree

Hide file tree

Showing 33 changed files with 130 additions and 217 deletions.
diff --git a/Include/ssGUI/Extensions/AdvancedPosition.hpp b/Include/ssGUI/Extensions/AdvancedPosition.hpp
@@ -159,15 +159,15 @@ namespace Extensions
 
             //function: GetExtensionName
             //See <Extension::GetExtensionName>
-            virtual std::string GetExtensionName() override;
+            virtual std::string GetExtensionName() const override;
 
             //function: BindToObject
             //See <Extension::BindToObject>
             virtual void BindToObject(ssGUI::GUIObject* bindObj) override;
 
             //function: Copy
             //See <Extension::Copy>
-            virtual void Copy(ssGUI::Extensions::Extension* extension) override;
+            virtual void Copy(const ssGUI::Extensions::Extension* extension) override;
 
             //function: Internal_GetObjectsReferences
             //See <Extension::Internal_GetObjectsReferences>

diff --git a/Include/ssGUI/Extensions/AdvancedSize.hpp b/Include/ssGUI/Extensions/AdvancedSize.hpp
@@ -141,15 +141,15 @@ namespace Extensions
 
             //function: GetExtensionName
             //See <Extension::GetExtensionName>
-            virtual std::string GetExtensionName() override;
+            virtual std::string GetExtensionName() const override;
 
             //function: BindToObject
             //See <Extension::BindToObject>
             virtual void BindToObject(ssGUI::GUIObject* bindObj) override;
 
             //function: Copy
             //See <Extension::Copy>
-            virtual void Copy(ssGUI::Extensions::Extension* extension) override;
+            virtual void Copy(const ssGUI::Extensions::Extension* extension) override;
 
             //function: Internal_GetObjectsReferences
             //See <Extension::Internal_GetObjectsReferences>

diff --git a/Include/ssGUI/Extensions/Border.hpp b/Include/ssGUI/Extensions/Border.hpp
@@ -133,15 +133,15 @@ namespace Extensions
 
             //function: GetExtensionName
             //See <Extension::GetExtensionName>
-            virtual std::string GetExtensionName() override;
+            virtual std::string GetExtensionName() const override;
 
             //function: BindToObject
             //See <Extension::BindToObject>
             virtual void BindToObject(ssGUI::GUIObject* bindObj) override;
 
             //function: Copy
             //See <Extension::Copy>
-            virtual void Copy(ssGUI::Extensions::Extension* extension) override;
+            virtual void Copy(const ssGUI::Extensions::Extension* extension) override;
 
             //function: Internal_GetObjectsReferences
             //See <Extension::Internal_GetObjectsReferences>

diff --git a/Include/ssGUI/Extensions/BoxShadow.hpp b/Include/ssGUI/Extensions/BoxShadow.hpp
@@ -143,15 +143,15 @@ namespace Extensions
 
             //function: GetExtensionName
             //See <Extension::GetExtensionName>
-            virtual std::string GetExtensionName() override;
+            virtual std::string GetExtensionName() const override;
 
             //function: BindToObject
             //See <Extension::BindToObject>
             virtual void BindToObject(ssGUI::GUIObject* bindObj) override;
 
             //function: Copy
             //See <Extension::Copy>
-            virtual void Copy(ssGUI::Extensions::Extension* extension) override;
+            virtual void Copy(const ssGUI::Extensions::Extension* extension) override;
 
             //function: Internal_GetObjectsReferences
             //See <Extension::Internal_GetObjectsReferences>

diff --git a/Include/ssGUI/Extensions/DockableV2.hpp b/Include/ssGUI/Extensions/DockableV2.hpp
@@ -363,15 +363,15 @@ namespace Extensions
 
             //function: GetExtensionName
             //See <Extension::GetExtensionName>
-            virtual std::string GetExtensionName() override;
+            virtual std::string GetExtensionName() const override;
 
             //function: BindToObject
             //See <Extension::BindToObject>
             virtual void BindToObject(ssGUI::GUIObject* bindObj) override;
 
             //function: Copy
             //See <Extension::Copy>
-            virtual void Copy(ssGUI::Extensions::Extension* extension) override;
+            virtual void Copy(const ssGUI::Extensions::Extension* extension) override;
 
             //function: Internal_GetObjectsReferences
             //See <Extension::Internal_GetObjectsReferences>

diff --git a/Include/ssGUI/Extensions/DockingArea.hpp b/Include/ssGUI/Extensions/DockingArea.hpp
@@ -211,15 +211,15 @@ namespace Extensions
 
             //function: GetExtensionName
             //See <Extension::GetExtensionName>
-            virtual std::string GetExtensionName() override;
+            virtual std::string GetExtensionName() const override;
 
             //function: BindToObject
             //See <Extension::BindToObject>
             virtual void BindToObject(ssGUI::GUIObject* bindObj) override;
 
             //function: Copy
             //See <Extension::Copy>
-            virtual void Copy(ssGUI::Extensions::Extension* extension) override;
+            virtual void Copy(const ssGUI::Extensions::Extension* extension) override;
 
             //function: Internal_GetObjectsReferences
             //See <Extension::Internal_GetObjectsReferences>

diff --git a/Include/ssGUI/Extensions/Extension.hpp b/Include/ssGUI/Extensions/Extension.hpp
@@ -69,7 +69,7 @@ namespace Extensions
 
             //function: GetExtensionName
             //Returns this extension's name
-            virtual std::string GetExtensionName() = 0;
+            virtual std::string GetExtensionName() const = 0;
 
             //TODO: CHange this to internal
 
@@ -79,7 +79,7 @@ namespace Extensions
 
             //function: Copy
             //Copy all values of this extension to another extension
-            virtual void Copy(ssGUI::Extensions::Extension* extension) = 0;
+            virtual void Copy(const ssGUI::Extensions::Extension* extension) = 0;
 
             //function: Internal_GetObjectsReferences
             //Returns all the referenced GUI Objects. If nullptr is returned, this extension is not referencing any GUI Object (exception for container).

diff --git a/Include/ssGUI/Extensions/Layout.hpp b/Include/ssGUI/Extensions/Layout.hpp
@@ -161,9 +161,11 @@ namespace Extensions
             static const std::string EXTENSION_NAME;
 
             //function: IsHorizontalLayout
+            //Returns true if the children are positioned left to right (horizontal) or top to bottom (vertical)
             virtual bool IsHorizontalLayout() const;
 
             //function: SetHorizontalLayout
+            //Sets if the children are positioned left to right (horizontal) or top to bottom (vertical)
             virtual void SetHorizontalLayout(bool horizontal);
 
             //function: AddPreferredSizeMultiplier
@@ -172,6 +174,8 @@ namespace Extensions
             virtual void AddPreferredSizeMultiplier(float sizeMultiplier);
 
             //function: AddPreferredSizeMultiplier
+            //Template version of <AddPreferredSizeMultiplier> for adding multiple size multipliers at once.
+            //See <AddPreferredSizeMultiplier>
             template<typename... floats>
             inline void AddPreferredSizeMultipliers(float sizeMultiplier, floats... sizeMultipliers)
             {
@@ -180,6 +184,8 @@ namespace Extensions
             }
 
             //function: AddPreferredSizeMultiplier
+            //Array version of <AddPreferredSizeMultiplier> for adding multiple size multipliers at once.
+            //See <AddPreferredSizeMultiplier>
             virtual void AddPreferredSizeMultipliers(float sizeMultipliers[], int count);
 
             //function: SetPreferredSizeMultiplier
@@ -289,6 +295,11 @@ namespace Extensions
             //If a GUI Object is excluded, it will be ignored
             virtual void UnexcludeObject(ssGUI::GUIObject* obj);
 
+            virtual void ForceUpdateLayout( ssGUI::Backend::BackendSystemInputInterface* inputInterface, 
+                                            ssGUI::InputStatus& currentInputStatus, 
+                                            ssGUI::InputStatus& lastInputStatus, 
+                                            ssGUI::GUIObject* mainWindow);
+
             //function: Internal_OnRecursiveChildAdded
             //(Internal ssGUI function) Listener function when a child is being added
             virtual void Internal_OnRecursiveChildAdded(ssGUI::GUIObject* child);
@@ -328,15 +339,15 @@ namespace Extensions
 
             //function: GetExtensionName
             //See <Extension::GetExtensionName>
-            virtual std::string GetExtensionName() override;
+            virtual std::string GetExtensionName() const override;
 
             //function: BindToObject
             //See <Extension::BindToObject>
             virtual void BindToObject(ssGUI::GUIObject* bindObj) override;
 
             //function: Copy
             //See <Extension::Copy>
-            virtual void Copy(ssGUI::Extensions::Extension* extension) override;
+            virtual void Copy(const ssGUI::Extensions::Extension* extension) override;
 
             //function: Internal_GetObjectsReferences
             //See <Extension::Internal_GetObjectsReferences>

diff --git a/Include/ssGUI/Extensions/Legacy/Dockable.hpp b/Include/ssGUI/Extensions/Legacy/Dockable.hpp
@@ -283,15 +283,15 @@ namespace Extensions
 
             //function: GetExtensionName
             //See <Extension::GetExtensionName>
-            virtual std::string GetExtensionName() override;
+            virtual std::string GetExtensionName() const override;
 
             //function: BindToObject
             //See <Extension::BindToObject>
             virtual void BindToObject(ssGUI::GUIObject* bindObj) override;
 
             //function: Copy
             //See <Extension::Copy>
-            virtual void Copy(ssGUI::Extensions::Extension* extension) override;
+            virtual void Copy(const ssGUI::Extensions::Extension* extension) override;
 
             //function: Internal_GetObjectsReferences
             //See <Extension::Internal_GetObjectsReferences>

diff --git a/Include/ssGUI/Extensions/Legacy/Docker.hpp b/Include/ssGUI/Extensions/Legacy/Docker.hpp
@@ -210,15 +210,15 @@ namespace Extensions
 
             //function: GetExtensionName
             //See <Extension::GetExtensionName>
-            virtual std::string GetExtensionName() override;
+            virtual std::string GetExtensionName() const override;
 
             //function: BindToObject
             //See <Extension::BindToObject>
             virtual void BindToObject(ssGUI::GUIObject* bindObj) override;
 
             //function: Copy
             //See <Extension::Copy>
-            virtual void Copy(ssGUI::Extensions::Extension* extension) override;
+            virtual void Copy(const ssGUI::Extensions::Extension* extension) override;
 
             //function: Internal_GetObjectsReferences
             //See <Extension::Internal_GetObjectsReferences>

diff --git a/Include/ssGUI/Extensions/Mask.hpp b/Include/ssGUI/Extensions/Mask.hpp
@@ -229,15 +229,15 @@ namespace Extensions
 
             //function: GetExtensionName
             //See <Extension::GetExtensionName>
-            virtual std::string GetExtensionName() override;
+            virtual std::string GetExtensionName() const override;
 
             //function: BindToObject
             //See <Extension::BindToObject>
             virtual void BindToObject(ssGUI::GUIObject* bindObj) override;
 
             //function: Copy
             //See <Extension::Copy>
-            virtual void Copy(ssGUI::Extensions::Extension* extension) override;
+            virtual void Copy(const ssGUI::Extensions::Extension* extension) override;
 
             //function: Internal_GetObjectsReferences
             //See <Extension::Internal_GetObjectsReferences>

diff --git a/Include/ssGUI/Extensions/MaskEnforcer.hpp b/Include/ssGUI/Extensions/MaskEnforcer.hpp
@@ -124,15 +124,15 @@ namespace Extensions
 
             //function: GetExtensionName
             //See <Extension::GetExtensionName>
-            virtual std::string GetExtensionName() override;
+            virtual std::string GetExtensionName() const override;
 
             //function: BindToObject
             //See <Extension::BindToObject>
             virtual void BindToObject(ssGUI::GUIObject* bindObj) override;
 
             //function: Copy
             //See <Extension::Copy>
-            virtual void Copy(ssGUI::Extensions::Extension* extension) override;
+            virtual void Copy(const ssGUI::Extensions::Extension* extension) override;
 
             //function: Internal_GetObjectsReferences
             //See <Extension::Internal_GetObjectsReferences>

diff --git a/Include/ssGUI/Extensions/Outline.hpp b/Include/ssGUI/Extensions/Outline.hpp
@@ -222,15 +222,15 @@ namespace Extensions
 
             //function: GetExtensionName
             //See <Extension::GetExtensionName>
-            virtual std::string GetExtensionName() override;
+            virtual std::string GetExtensionName() const override;
 
             //function: BindToObject
             //See <Extension::BindToObject>
             virtual void BindToObject(ssGUI::GUIObject* bindObj) override;
 
             //function: Copy
             //See <Extension::Copy>
-            virtual void Copy(ssGUI::Extensions::Extension* extension) override;
+            virtual void Copy(const ssGUI::Extensions::Extension* extension) override;
 
             //function: Internal_GetObjectsReferences
             //See <Extension::Internal_GetObjectsReferences>

diff --git a/Include/ssGUI/Extensions/RoundedCorners.hpp b/Include/ssGUI/Extensions/RoundedCorners.hpp
@@ -174,15 +174,15 @@ namespace Extensions
 
             //function: GetExtensionName
             //See <Extension::GetExtensionName>
-            virtual std::string GetExtensionName() override;
+            virtual std::string GetExtensionName() const override;
 
             //function: BindToObject
             //See <Extension::BindToObject>
             virtual void BindToObject(ssGUI::GUIObject* bindObj) override;
 
             //function: Copy
             //See <Extension::Copy>
-            virtual void Copy(ssGUI::Extensions::Extension* extension) override;
+            virtual void Copy(const ssGUI::Extensions::Extension* extension) override;
 
             //function: Internal_GetObjectsReferences
             //See <Extension::Internal_GetObjectsReferences>

diff --git a/Include/ssGUI/Extensions/Shape.hpp b/Include/ssGUI/Extensions/Shape.hpp
@@ -307,6 +307,8 @@ namespace Extensions
             Nullptr can be returned if the id is invalid. */
             virtual std::vector<glm::u8vec4>* GetAdditionalShapeColorsWithID(int id);
 
+            //TODO: Get shape index with id
+
             //TODO: Maybe allow getting properties of different shapes
 
             //function: GetAdditionalShapesCount
@@ -356,15 +358,15 @@ namespace Extensions
 
             //function: GetExtensionName
             //See <Extension::GetExtensionName>
-            virtual std::string GetExtensionName() override;
+            virtual std::string GetExtensionName() const override;
 
             //function: BindToObject
             //See <Extension::BindToObject>
             virtual void BindToObject(ssGUI::GUIObject* bindObj) override;
 
             //function: Copy
             //See <Extension::Copy>
-            virtual void Copy(ssGUI::Extensions::Extension* extension) override;
+            virtual void Copy(const ssGUI::Extensions::Extension* extension) override;
 
             //function: Internal_GetObjectsReferences
             //See <Extension::Internal_GetObjectsReferences>

diff --git a/Include/ssGUI/Extensions/TemplateExtension.hpp b/Include/ssGUI/Extensions/TemplateExtension.hpp
@@ -87,15 +87,15 @@ namespace Extensions
 
             //function: GetExtensionName
             //See <Extension::GetExtensionName>
-            virtual std::string GetExtensionName() override;
+            virtual std::string GetExtensionName() const override;
 
             //function: BindToObject
             //See <Extension::BindToObject>
             virtual void BindToObject(ssGUI::GUIObject* bindObj) override;
 
             //function: Copy
             //See <Extension::Copy>
-            virtual void Copy(ssGUI::Extensions::Extension* extension) override;
+            virtual void Copy(const ssGUI::Extensions::Extension* extension) override;
 
             //function: Internal_GetObjectsReferences
             //See <Extension::Internal_GetObjectsReferences>

diff --git a/Include/ssGUI/Extensions/WindowLayoutItemEnforcer.hpp b/Include/ssGUI/Extensions/WindowLayoutItemEnforcer.hpp
@@ -88,15 +88,15 @@ namespace Extensions
 
             //function: GetExtensionName
             //See <Extension::GetExtensionName>
-            virtual std::string GetExtensionName() override;
+            virtual std::string GetExtensionName() const override;
 
             //function: BindToObject
             //See <Extension::BindToObject>
             virtual void BindToObject(ssGUI::GUIObject* bindObj) override;
 
             //function: Copy
             //See <Extension::Copy>
-            virtual void Copy(ssGUI::Extensions::Extension* extension) override;
+            virtual void Copy(const ssGUI::Extensions::Extension* extension) override;
 
             //function: Internal_GetObjectsReferences
             //See <Extension::Internal_GetObjectsReferences>

diff --git a/Src/ssGUI/Extensions/AdvancedPosition.cpp b/Src/ssGUI/Extensions/AdvancedPosition.cpp
@@ -23,13 +23,7 @@ namespace Extensions
     AdvancedPosition::AdvancedPosition(AdvancedPosition const& other)
     {
         Container = nullptr;
-        Enabled = other.IsEnabled();
-        CurrentHorizontal = other.GetHorizontalAlignment();
-        CurrentVertical = other.GetVerticalAlignment();
-        HorizontalPixelValue = other.GetHorizontalPixel();
-        VerticalPixelValue = other.GetVerticalPixel();
-        HorizontalPercentageValue = other.GetHorizontalPercentage();
-        VerticalPercentageValue = other.GetVerticalPercentage();
+        Copy(&other);
     }
 
     void AdvancedPosition::ConstructRenderInfo()
@@ -231,7 +225,7 @@ namespace Extensions
         //Nothing to draw
     }
 
-    std::string AdvancedPosition::GetExtensionName()
+    std::string AdvancedPosition::GetExtensionName() const
     {
         return EXTENSION_NAME;
     }
@@ -241,12 +235,12 @@ namespace Extensions
         Container = bindObj;
     }
 
-    void AdvancedPosition::Copy(ssGUI::Extensions::Extension* extension)
+    void AdvancedPosition::Copy(const ssGUI::Extensions::Extension* extension)
     {
         if(extension->GetExtensionName() != EXTENSION_NAME)
             return;
 
-        ssGUI::Extensions::AdvancedPosition* ap = static_cast<ssGUI::Extensions::AdvancedPosition*>(extension);
+        auto* ap = static_cast<const ssGUI::Extensions::AdvancedPosition*>(extension);
         Enabled = ap->IsEnabled();
         CurrentHorizontal = ap->GetHorizontalAlignment();
         CurrentVertical = ap->GetVerticalAlignment();