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

Fix some corner cases in the Menu/OptionButton item auto-highlight

Browse Source
This commit is contained in:
Michael Alexsander
2022-08-27 13:41:58 -03:00
parent 5beec641b6
commit 1e80b17a8d
6 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scene/gui/popup_menu.cpp
View File

@@ -171,9 +171,14 @@ void PopupMenu::_activate_submenu(int over, bool p_by_keyboard) {
PopupMenu *pum = Object::cast_to<PopupMenu>(pm);
if (pum) {
// If not triggered by the mouse, start the popup with its first item selected.
if (pum->get_item_count() > 0 && p_by_keyboard) {
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 < pum->get_item_count(); i++) {
if (!pum->is_item_disabled(i)) {
pum->set_current_index(i);
break;
}
}
}
// Setting autohide areas *must* be done after `popup()` which can move the popup (to fit it into the viewport).
@@ -1049,7 +1054,14 @@ 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;
update();
}