godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-23 15:16:17 +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

15
scene/gui/option_button.cpp
View File

@@ -112,9 +112,18 @@ void OptionButton::pressed() {
popup->set_size(Size2(size.width, 0));
popup->set_scale(get_global_transform().get_scale());
// If not triggered by the mouse, start the popup with its first item selected.
if (popup->get_item_count() > 0 && !_was_pressed_by_mouse()) {
popup->set_current_index(0);
// If not triggered by the mouse, start the popup with the checked item (or the first enabled one) focused.
if (!_was_pressed_by_mouse()) {
if (current > -1 && !popup->is_item_disabled(current)) {
popup->set_current_index(current);
} else {
for (int i = 0; i < popup->get_item_count(); i++) {
if (!popup->is_item_disabled(i)) {
popup->set_current_index(i);
break;
}
}
}
}
popup->popup();