Fixed AddPreferredSizeMultiplier not working properly...

Fixed AddPreferredSizeMultiplier not working properly when multiple multipliers are passed, Renamed AddPreferredSizeMultiplier to AddPreferredSizeMultipliers for multiple mulipliers versions
Neko-Box-Coder · May 13, 2023 · a6a4f4b · a6a4f4b
1 parent 1c28cbb
commit a6a4f4b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Include/ssGUI/Extensions/Layout.hpp b/Include/ssGUI/Extensions/Layout.hpp
@@ -141,6 +141,8 @@ namespace Extensions
             virtual void ConstructRenderInfo() override;
             virtual void ConstructRenderInfo(ssGUI::Backend::BackendDrawingInterface* drawingInterface, ssGUI::GUIObject* mainWindow, glm::vec2 mainWindowPositionOffset) override;
 
+            //NOTE: A little bit retarded but works well enough to shut the compiler up when "floats... sizeMultipliers" is empty
+            inline void AddPreferredSizeMultipliers(){}
 
         public:
             static const std::string EXTENSION_NAME;
@@ -158,13 +160,14 @@ namespace Extensions
 
             //function: AddPreferredSizeMultiplier
             template<typename... floats>
-            inline void AddPreferredSizeMultiplier(float sizeMultiplier, floats... sizeMultipliers)
+            inline void AddPreferredSizeMultipliers(float sizeMultiplier, floats... sizeMultipliers)
             {
                 AddPreferredSizeMultiplier(sizeMultiplier);
+                AddPreferredSizeMultipliers(sizeMultipliers...);
             }
 
             //function: AddPreferredSizeMultiplier
-            virtual void AddPreferredSizeMultiplier(float sizeMultipliers[], int count);
+            virtual void AddPreferredSizeMultipliers(float sizeMultipliers[], int count);
 
             //function: SetPreferredSizeMultiplier
             //Sets the child with the index to be the size of sizeMultiplier.

diff --git a/Src/ssGUI/Extensions/Layout.cpp b/Src/ssGUI/Extensions/Layout.cpp
@@ -746,7 +746,7 @@ namespace Extensions
         PreferredSizeMultipliers.push_back(sizeMultiplier);
     }
 
-    void Layout::AddPreferredSizeMultiplier(float sizeMultipliers[], int count)
+    void Layout::AddPreferredSizeMultipliers(float sizeMultipliers[], int count)
     {
         for(int i = 0; i < count; i++)
             PreferredSizeMultipliers.push_back(sizeMultipliers[i]);