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

Merge pull request #31880 from nekomatata/joystick-ui-navigation

Browse Source 
Fixed UI navigation using joy axis inputs
This commit is contained in:
Rémi Verschelde 2019-09-03 12:02:18 +02:00 committed by GitHub
commit a1fe20a57e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scene/main/viewport.cpp
View File

@ -2289,32 +2289,34 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
if (from && p_event->is_pressed()) { if (from && p_event->is_pressed()) {
Control *next = NULL; Control *next = NULL;
if (p_event->is_action_pressed("ui_focus_next")) { Input *input = Input::get_singleton();
if (p_event->is_action_pressed("ui_focus_next") && input->is_action_just_pressed("ui_focus_next")) {
next = from->find_next_valid_focus(); next = from->find_next_valid_focus();
} }
if (p_event->is_action_pressed("ui_focus_prev")) { if (p_event->is_action_pressed("ui_focus_prev") && input->is_action_just_pressed("ui_focus_prev")) {
next = from->find_prev_valid_focus(); next = from->find_prev_valid_focus();
} }
if (!mods && p_event->is_action_pressed("ui_up")) { if (!mods && p_event->is_action_pressed("ui_up") && input->is_action_just_pressed("ui_up")) {
next = from->_get_focus_neighbour(MARGIN_TOP); next = from->_get_focus_neighbour(MARGIN_TOP);
} }
if (!mods && p_event->is_action_pressed("ui_left")) { if (!mods && p_event->is_action_pressed("ui_left") && input->is_action_just_pressed("ui_left")) {
next = from->_get_focus_neighbour(MARGIN_LEFT); next = from->_get_focus_neighbour(MARGIN_LEFT);
} }
if (!mods && p_event->is_action_pressed("ui_right")) { if (!mods && p_event->is_action_pressed("ui_right") && input->is_action_just_pressed("ui_right")) {
next = from->_get_focus_neighbour(MARGIN_RIGHT); next = from->_get_focus_neighbour(MARGIN_RIGHT);
} }
if (!mods && p_event->is_action_pressed("ui_down")) { if (!mods && p_event->is_action_pressed("ui_down") && input->is_action_just_pressed("ui_down")) {
next = from->_get_focus_neighbour(MARGIN_BOTTOM); next = from->_get_focus_neighbour(MARGIN_BOTTOM);
} }