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

Merge pull request #64960 from YeldhamDev/more_hl_stuff

Browse Source
This commit is contained in:
Rémi Verschelde
2022-08-29 08:05:33 +02:00
committed by GitHub
parent 34f45d7b28 221344b9e2
commit f647292df5
5 changed files with 45 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scene/gui/popup_menu.cpp
View File

@ -216,9 +216,14 @@ void PopupMenu::_activate_submenu(int p_over, bool p_by_keyboard) {
submenu_pum->activated_by_keyboard = p_by_keyboard;
// If not triggered by the mouse, start the popup with its first item selected.
if (submenu_pum->get_item_count() > 0 && p_by_keyboard) {
submenu_pum->set_current_index(0);
// If not triggered by the mouse, start the popup with its first enabled item focused.
if (p_by_keyboard) {
for (int i = 0; i < submenu_pum->get_item_count(); i++) {
if (!submenu_pum->is_item_disabled(i)) {
submenu_pum->set_current_index(i);
break;
}
}
}
submenu_pum->popup();
@ -1534,14 +1539,19 @@ bool PopupMenu::is_item_shortcut_disabled(int p_idx) const {
}
void PopupMenu::set_current_index(int p_idx) {
ERR_FAIL_INDEX(p_idx, items.size());
if (p_idx != -1) {
ERR_FAIL_INDEX(p_idx, items.size());
}
if (mouse_over == p_idx) {
return;
}
mouse_over = p_idx;
scroll_to_item(mouse_over);
if (mouse_over != -1) {
scroll_to_item(mouse_over);
}
control->update();
}