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

Merge pull request #26853 from groud/fix_ui_navigation

Browse Source 
Fixes UI navigation with joysticks
This commit is contained in:
Rémi Verschelde 2019-03-09 22:29:44 +01:00 committed by GitHub
commit 86c5f31dd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scene/main/viewport.cpp
View File

@ -2290,32 +2290,32 @@ 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("ui_focus_next")) { if (p_event->is_action_pressed("ui_focus_next")) {
next = from->find_next_valid_focus(); next = from->find_next_valid_focus();
} }
if (p_event->is_action("ui_focus_prev")) { if (p_event->is_action_pressed("ui_focus_prev")) {
next = from->find_prev_valid_focus(); next = from->find_prev_valid_focus();
} }
if (!mods && p_event->is_action("ui_up")) { if (!mods && p_event->is_action_pressed("ui_up")) {
next = from->_get_focus_neighbour(MARGIN_TOP); next = from->_get_focus_neighbour(MARGIN_TOP);
} }
if (!mods && p_event->is_action("ui_left")) { if (!mods && p_event->is_action_pressed("ui_left")) {
next = from->_get_focus_neighbour(MARGIN_LEFT); next = from->_get_focus_neighbour(MARGIN_LEFT);
} }
if (!mods && p_event->is_action("ui_right")) { if (!mods && p_event->is_action_pressed("ui_right")) {
next = from->_get_focus_neighbour(MARGIN_RIGHT); next = from->_get_focus_neighbour(MARGIN_RIGHT);
} }
if (!mods && p_event->is_action("ui_down")) { if (!mods && p_event->is_action_pressed("ui_down")) {
next = from->_get_focus_neighbour(MARGIN_BOTTOM); next = from->_get_focus_neighbour(MARGIN_BOTTOM);
} }