diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-08-24 19:07:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-24 19:07:25 +0200 |
| commit | b7d2ba12c81ccd1ec509b7a7503f0136ae204f63 (patch) | |
| tree | c47a34dd7b7b36eed7458f82d8dd92919c563dda /scene/gui/option_button.cpp | |
| parent | 29616514448297d8222928fe89e8b62193d1fa44 (diff) | |
| parent | 1da50698fcb4bc8350c89c6777b5960bc2cc758a (diff) | |
| download | redot-engine-b7d2ba12c81ccd1ec509b7a7503f0136ae204f63.tar.gz | |
Merge pull request #64635 from YeldhamDev/menu_buttons_popup_fix
Make `Menu/OptionButton` item auto-highlight behave better
Diffstat (limited to 'scene/gui/option_button.cpp')
| -rw-r--r-- | scene/gui/option_button.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scene/gui/option_button.cpp b/scene/gui/option_button.cpp index a5a6240e27..931dffe3bb 100644 --- a/scene/gui/option_button.cpp +++ b/scene/gui/option_button.cpp @@ -204,8 +204,7 @@ void OptionButton::pressed() { // If not triggered by the mouse, start the popup with the checked item selected. if (popup->get_item_count() > 0) { - if ((get_action_mode() == ActionMode::ACTION_MODE_BUTTON_PRESS && Input::get_singleton()->is_action_just_pressed("ui_accept")) || - (get_action_mode() == ActionMode::ACTION_MODE_BUTTON_RELEASE && Input::get_singleton()->is_action_just_released("ui_accept"))) { + if (!_was_pressed_by_mouse()) { popup->set_current_index(current > -1 ? current : 0); } else { popup->scroll_to_item(current > -1 ? current : 0); |