seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Free submenu children when clearing PopupMenu

Browse Source
This commit is contained in:
kobewi
2023-07-27 19:50:31 +02:00
parent df0a822323
commit df24882f9a
5 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scene/gui/popup_menu.cpp
View File

@ -1908,10 +1908,18 @@ void PopupMenu::add_separator(const String &p_text, int p_id) {
_menu_changed();
}
void PopupMenu::clear() {
for (int i = 0; i < items.size(); i++) {
if (items[i].shortcut.is_valid()) {
_unref_shortcut(items[i].shortcut);
void PopupMenu::clear(bool p_free_submenus) {
for (const Item &I : items) {
if (I.shortcut.is_valid()) {
_unref_shortcut(I.shortcut);
}
if (p_free_submenus && !I.submenu.is_empty()) {
Node *submenu = get_node_or_null(I.submenu);
if (submenu) {
remove_child(submenu);
submenu->queue_free();
}
}
}
items.clear();
@ -2236,7 +2244,7 @@ void PopupMenu::_bind_methods() {
ClassDB::bind_method(D_METHOD("remove_item", "index"), &PopupMenu::remove_item);
ClassDB::bind_method(D_METHOD("add_separator", "label", "id"), &PopupMenu::add_separator, DEFVAL(String()), DEFVAL(-1));
ClassDB::bind_method(D_METHOD("clear"), &PopupMenu::clear);
ClassDB::bind_method(D_METHOD("clear", "free_submenus"), &PopupMenu::clear, DEFVAL(false));
ClassDB::bind_method(D_METHOD("set_hide_on_item_selection", "enable"), &PopupMenu::set_hide_on_item_selection);
ClassDB::bind_method(D_METHOD("is_hide_on_item_selection"), &PopupMenu::is_hide_on_item_selection);