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

PopupMenu: Add ui_focus_next and prev to navigation

This commit is contained in:
Giganzo 2024-07-25 14:35:13 +02:00
parent e343dbbcc1
commit 0801c39732
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scene/gui/popup_menu.cpp
View File

@ -458,7 +458,7 @@ void PopupMenu::_input_from_window_internal(const Ref<InputEvent> &p_event) {
Ref<InputEventJoypadButton> joypadbutton_event = p_event; Ref<InputEventJoypadButton> joypadbutton_event = p_event;
bool is_joypad_event = (joypadmotion_event.is_valid() || joypadbutton_event.is_valid()); bool is_joypad_event = (joypadmotion_event.is_valid() || joypadbutton_event.is_valid());
if (p_event->is_action("ui_down", true) && p_event->is_pressed()) { if ((p_event->is_action("ui_down", true) && p_event->is_pressed()) || (p_event->is_action("ui_focus_next", true) && p_event->is_pressed())) {
if (is_joypad_event) { if (is_joypad_event) {
if (!input->is_action_just_pressed("ui_down", true)) { if (!input->is_action_just_pressed("ui_down", true)) {
return; return;
@ -496,7 +496,7 @@ void PopupMenu::_input_from_window_internal(const Ref<InputEvent> &p_event) {
} }
} }
} }
} else if (p_event->is_action("ui_up", true) && p_event->is_pressed()) { } else if ((p_event->is_action("ui_up", true) && p_event->is_pressed()) || (p_event->is_action("ui_focus_prev", true) && p_event->is_pressed())) {
if (is_joypad_event) { if (is_joypad_event) {
if (!input->is_action_just_pressed("ui_up", true)) { if (!input->is_action_just_pressed("ui_up", true)) {
return; return;
@ -1071,7 +1071,7 @@ void PopupMenu::_notification(int p_what) {
case NOTIFICATION_INTERNAL_PROCESS: { case NOTIFICATION_INTERNAL_PROCESS: {
Input *input = Input::get_singleton(); Input *input = Input::get_singleton();
if (input->is_action_just_released("ui_up") || input->is_action_just_released("ui_down")) { if (input->is_action_just_released("ui_up") || input->is_action_just_released("ui_down") || input->is_action_just_released("ui_focus_next") || input->is_action_just_released("ui_focus_prev")) {
gamepad_event_delay_ms = DEFAULT_GAMEPAD_EVENT_DELAY_MS; gamepad_event_delay_ms = DEFAULT_GAMEPAD_EVENT_DELAY_MS;
set_process_internal(false); set_process_internal(false);
return; return;