asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #87249 from bruvzg/macos_menu_clear

Browse source 
[macOS] Do not unbind PopupMenu from global menu on `clear` call.
This commit is contained in:
Rémi Verschelde 2024-01-16 15:07:47 +01:00
commit 04eafd557f
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scene/gui/popup_menu.cpp
View file

@ -2424,7 +2424,8 @@ void PopupMenu::clear(bool p_free_submenus) {
} }
if (!global_menu_name.is_empty()) { 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]; Item &item = items.write[i];
if (!item.submenu.is_empty()) { if (!item.submenu.is_empty()) {
PopupMenu *pm = Object::cast_to<PopupMenu>(get_node_or_null(item.submenu)); PopupMenu *pm = Object::cast_to<PopupMenu>(get_node_or_null(item.submenu));
@ -2433,8 +2434,8 @@ void PopupMenu::clear(bool p_free_submenus) {
} }
item.submenu_bound = false; item.submenu_bound = false;
} }
ds->global_menu_remove_item(global_menu_name, i);
} }
DisplayServer::get_singleton()->global_menu_clear(global_menu_name);
} }
items.clear(); items.clear();