godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-13 13:31:48 +00:00
Code Releases Wiki Activity

Merge pull request #61686 from YeldhamDev/weird_bugs

Browse Source 
Fix specific bug related to submenus in `PopupMenu`
This commit is contained in:
Rémi Verschelde
2022-06-05 13:21:33 +02:00
committed by GitHub
parent 4ff41cc4f8 b4e4f88cd9
commit ef8401edf5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scene/gui/popup_menu.cpp
View File

@@ -167,6 +167,7 @@ void PopupMenu::_activate_submenu(int over) {
pm->set_position(pos); pm->set_position(pos);
pm->set_scale(get_global_transform().get_scale()); pm->set_scale(get_global_transform().get_scale());
pm->popup();
PopupMenu *pum = Object::cast_to<PopupMenu>(pm); PopupMenu *pum = Object::cast_to<PopupMenu>(pm);
if (pum) { if (pum) {
@@ -175,6 +176,7 @@ void PopupMenu::_activate_submenu(int over) {
pum->set_current_index(0); pum->set_current_index(0);
} }
// Setting autohide areas *must* be done after `popup()` which can move the popup (to fit it into the viewport).
pr.position -= pum->get_global_position(); pr.position -= pum->get_global_position();
pum->clear_autohide_areas(); pum->clear_autohide_areas();
pum->add_autohide_area(Rect2(pr.position.x, pr.position.y, pr.size.x, items[over]._ofs_cache)); pum->add_autohide_area(Rect2(pr.position.x, pr.position.y, pr.size.x, items[over]._ofs_cache));
@@ -183,8 +185,6 @@ void PopupMenu::_activate_submenu(int over) {
pum->add_autohide_area(Rect2(pr.position.x, pr.position.y + from, pr.size.x, pr.size.y - from)); pum->add_autohide_area(Rect2(pr.position.x, pr.position.y + from, pr.size.x, pr.size.y - from));
} }
} }
pm->popup();
} }
void PopupMenu::_submenu_timeout() { void PopupMenu::_submenu_timeout() {