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

Merge pull request #21962 from YeldhamDev/switch_hover_submenu

Browse source 
Fix MenuButton hover switching not happening with submenus open
This commit is contained in:
Juan Linietsky 2018-11-01 17:01:51 -03:00 committed by GitHub
commit 65e3ef705b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
scene/gui/popup_menu.cpp
View file

@ -557,6 +557,21 @@ void PopupMenu::_notification(int p_what) {
mouse_over = -1;
update();
}
for (int i = 0; i < items.size(); i++) {
if (items[i].submenu == "")
continue;
Node *n = get_node(items[i].submenu);
if (!n)
continue;
PopupMenu *pm = Object::cast_to<PopupMenu>(n);
if (!pm || !pm->is_visible())
continue;
pm->hide();
}
} break;
}
}
@ -1012,8 +1027,7 @@ bool PopupMenu::activate_item_by_event(const Ref<InputEvent> &p_event, bool p_fo
code |= KEY_MASK_SHIFT;
}
int il = items.size();
for (int i = 0; i < il; i++) {
for (int i = 0; i < items.size(); i++) {
if (is_item_disabled(i) || items[i].shortcut_is_disabled)
continue;

10
scene/main/viewport.cpp
View file

@ -1839,8 +1839,16 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
MenuButton *popup_menu_parent = NULL;
MenuButton *menu_button = Object::cast_to<MenuButton>(over);
if (popup_menu)
if (popup_menu) {
popup_menu_parent = Object::cast_to<MenuButton>(popup_menu->get_parent());
if (!popup_menu_parent) {
// Go through the parents to see if there's a MenuButton at the end.
while (Object::cast_to<PopupMenu>(popup_menu->get_parent())) {
popup_menu = Object::cast_to<PopupMenu>(popup_menu->get_parent());
}
popup_menu_parent = Object::cast_to<MenuButton>(popup_menu->get_parent());
}
}
// If the mouse is over a menu button, this menu will open automatically
// if there is already a pop-up menu open at the same hierarchical level.