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

Fix crash when pressing up on an empty PopupMenu

Browse Source
This commit is contained in:
Michael Alexsander
2022-08-27 18:13:27 -03:00
parent d3db8bbebd
commit 06df59887b
1 changed files with 69 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scene/gui/popup_menu.cpp
View File

@ -278,6 +278,7 @@ void PopupMenu::_submenu_timeout() {
void PopupMenu::gui_input(const Ref<InputEvent> &p_event) {
ERR_FAIL_COND(p_event.is_null());
if (!items.is_empty()) {
if (p_event->is_action("ui_down") && p_event->is_pressed()) {
int search_from = mouse_over + 1;
if (search_from >= items.size()) {
@ -376,6 +377,7 @@ void PopupMenu::gui_input(const Ref<InputEvent> &p_event) {
set_input_as_handled();
}
}
}
// Make an area which does not include v scrollbar, so that items are not activated when dragging scrollbar.
Rect2 item_clickable_area = scroll_container->get_rect();