Skip to content

Commit

Permalink
Merge pull request #87249 from bruvzg/macos_menu_clear
Browse files Browse the repository at this point in the history
[macOS] Do not unbind PopupMenu from global menu on `clear` call.
  • Loading branch information
akien-mga committed Jan 16, 2024
2 parents 35aee0e + 5a61fec commit 04eafd5
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions scene/gui/popup_menu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2424,7 +2424,8 @@ void PopupMenu::clear(bool p_free_submenus) {
}

if (!global_menu_name.is_empty()) {
for (int i = 0; i < items.size(); i++) {
DisplayServer *ds = DisplayServer::get_singleton();
for (int i = items.size() - 1; i >= 0; i--) {
Item &item = items.write[i];
if (!item.submenu.is_empty()) {
PopupMenu *pm = Object::cast_to<PopupMenu>(get_node_or_null(item.submenu));
Expand All @@ -2433,8 +2434,8 @@ void PopupMenu::clear(bool p_free_submenus) {
}
item.submenu_bound = false;
}
ds->global_menu_remove_item(global_menu_name, i);
}
DisplayServer::get_singleton()->global_menu_clear(global_menu_name);
}
items.clear();

Expand Down

0 comments on commit 04eafd5

Please sign in to comment.