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

Merge pull request #50780 from JFonS/fix_submenus 

Fix Popup submenu in single-window mode
This commit is contained in:
Rémi Verschelde 2021-07-23 22:15:23 +02:00 committed by GitHub
parent aa4babdc06 944b5ee639
commit 57388809f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scene/gui/popup_menu.cpp
View File

@ -397,10 +397,6 @@ void PopupMenu::_gui_input(const Ref<InputEvent> &p_event) {
Ref<InputEventMouseMotion> m = p_event;
if (m.is_valid()) {
if (!item_clickable_area.has_point(m->get_position())) {
return;
}
for (List<Rect2>::Element *E = autohide_areas.front(); E; E = E->next()) {
if (!Rect2(Point2(), get_size()).has_point(m->get_position()) && E->get().has_point(m->get_position())) {
_close_pressed();
@ -408,6 +404,10 @@ void PopupMenu::_gui_input(const Ref<InputEvent> &p_event) {
}
}
if (!item_clickable_area.has_point(m->get_position())) {
return;
}
int over = _get_mouse_over(m->get_position());
int id = (over < 0 || items[over].separator || items[over].disabled) ? -1 : (items[over].id >= 0 ? items[over].id : over);
@ -747,7 +747,7 @@ void PopupMenu::_notification(int p_what) {
} break;
case NOTIFICATION_INTERNAL_PROCESS: {
//only used when using operating system windows
if (get_window_id() != DisplayServer::INVALID_WINDOW_ID && autohide_areas.size()) {
if (!is_embedded() && autohide_areas.size()) {
Point2 mouse_pos = DisplayServer::get_singleton()->mouse_get_position();
mouse_pos -= get_position();
@ -786,7 +786,7 @@ void PopupMenu::_notification(int p_what) {
set_process_internal(false);
} else {
if (get_window_id() != DisplayServer::INVALID_WINDOW_ID) {
if (!is_embedded()) {
set_process_internal(true);
}