Fixed SetDropdownMenu (ByOANC07U4) and added ClearMenuItems to Menu...

Fixed SetDropdownMenu not copying menu items properly (ByOANC07U4), Added ClearMenuItems to Menu (dp8btys7DG)
Neko-Box-Coder · May 14, 2023 · 846dd4a · 846dd4a
1 parent 9786337
commit 846dd4a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 12 deletions.
diff --git a/Include/ssGUI/GUIObjectClasses/CompositeClasses/Dropdown.hpp b/Include/ssGUI/GUIObjectClasses/CompositeClasses/Dropdown.hpp
@@ -200,7 +200,10 @@ namespace ssGUI
             virtual ssGUI::Menu* GetDropdownMenu();
 
             //function: SetDropdownMenu
-            //Sets the dropdown menu GUI object
+            //Sets the dropdown menu GUI object.
+            //The menu items in the new menu will be cleared 
+            //and all the menu items from the old dropdown menu will moved to the new one.
+            //Passing nullptr will unset the dropdown menu object.
             virtual void SetDropdownMenu(ssGUI::Menu* menu);
 
             //function: GetType

diff --git a/Include/ssGUI/GUIObjectClasses/Menu.hpp b/Include/ssGUI/GUIObjectClasses/Menu.hpp
@@ -98,6 +98,10 @@ namespace ssGUI
             //function: RemoveMenuItem
             //Deletes the menu item
             void RemoveMenuItem(ssGUI::MenuItem* menuItem);
+
+            //function: ClearMenuItems
+            //Deletes all the menu items
+            void ClearMenuItems();
 
             //function: AddMenuItem
             //This is equivalent to

diff --git a/Src/ssGUI/GUIObjectClasses/CompositeClasses/Dropdown.cpp b/Src/ssGUI/GUIObjectClasses/CompositeClasses/Dropdown.cpp
@@ -275,17 +275,10 @@ namespace ssGUI
 
     void Dropdown::ClearItems()
     {
-        for(int i = 0; i < Items.size(); i++)
-        {
-            ssGUI::MenuItem* currentItem = static_cast<ssGUI::MenuItem*>(CurrentObjectsReferences.GetObjectReference(Items[i].second));
+        if(GetDropdownMenu() != nullptr)
+            GetDropdownMenu()->ClearMenuItems();
 
-            if(currentItem == nullptr)
-                continue;
-
-            currentItem->Delete();
-        }
         Items.clear();
-
         SetSelectedItem(-1);
     }
 
@@ -314,11 +307,12 @@ namespace ssGUI
         glm::vec2 globalPos = menu->GetGlobalPosition();
         menu->SetParent(this, true);
         menu->SetGlobalPosition(globalPos);
+        menu->ClearMenuItems();
 
         auto itemsCopy = Items;
         Items.clear();
-        for(int i = 0; i < Items.size(); i++)
-            AddItem(Items[i].first);
+        for(int i = 0; i < itemsCopy.size(); i++)
+            AddItem(itemsCopy[i].first);
     }
 
     ssGUI::Enums::GUIObjectType Dropdown::GetType() const

diff --git a/Src/ssGUI/GUIObjectClasses/Menu.cpp b/Src/ssGUI/GUIObjectClasses/Menu.cpp
@@ -212,6 +212,17 @@ namespace ssGUI
             SetSize(glm::vec2(GetSize().x, GetSize().y - itemSize.y - layoutItemSpacing));
     }
 
+    void Menu::ClearMenuItems()
+    {
+        std::vector<ssGUI::GUIObject*> children = GetListOfChildren();
+
+        for(int i = 0; i < children.size(); i++)
+        {
+            if(children[i]->GetType() == ssGUI::Enums::GUIObjectType::MENU_ITEM)
+                RemoveMenuItem(static_cast<ssGUI::MenuItem*>(children[i]));
+        }
+    }
+
     ssGUI::MenuItem* Menu::AddMenuItem()
     {
         ssGUI::MenuItem* menuItem = AddChild<ssGUI::MenuItem>();