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

Merge pull request #51346 from EricEzaM/fix-focus-key-shortcuts 

Fix focus shortcuts triggering incorrectly
This commit is contained in:
Rémi Verschelde 2021-09-21 09:48:28 +02:00 committed by GitHub
parent fd5a496f1f caac2e1a87
commit 68256e65f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scene/main/viewport.cpp
View File

@ -1972,35 +1972,30 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
Control *from = gui.key_focus ? gui.key_focus : nullptr; Control *from = gui.key_focus ? gui.key_focus : nullptr;
// Keyboard focus.
Ref<InputEventKey> k = p_event;
// Need to check for mods, otherwise any combination of alt/ctrl/shift+<up/down/left/right/etc> is handled here when it shouldn't be.
bool mods = k.is_valid() && (k->is_ctrl_pressed() || k->is_alt_pressed() || k->is_shift_pressed() || k->is_meta_pressed());
if (from && p_event->is_pressed()) { if (from && p_event->is_pressed()) {
Control *next = nullptr; Control *next = nullptr;
if (p_event->is_action_pressed("ui_focus_next", true)) { if (p_event->is_action_pressed("ui_focus_next", true, true)) {
next = from->find_next_valid_focus(); next = from->find_next_valid_focus();
} }
if (p_event->is_action_pressed("ui_focus_prev", true)) { if (p_event->is_action_pressed("ui_focus_prev", true, true)) {
next = from->find_prev_valid_focus(); next = from->find_prev_valid_focus();
} }
if (!mods && p_event->is_action_pressed("ui_up", true)) { if (p_event->is_action_pressed("ui_up", true, true)) {
next = from->_get_focus_neighbor(SIDE_TOP); next = from->_get_focus_neighbor(SIDE_TOP);
} }
if (!mods && p_event->is_action_pressed("ui_left", true)) { if (p_event->is_action_pressed("ui_left", true, true)) {
next = from->_get_focus_neighbor(SIDE_LEFT); next = from->_get_focus_neighbor(SIDE_LEFT);
} }
if (!mods && p_event->is_action_pressed("ui_right", true)) { if (p_event->is_action_pressed("ui_right", true, true)) {
next = from->_get_focus_neighbor(SIDE_RIGHT); next = from->_get_focus_neighbor(SIDE_RIGHT);
} }
if (!mods && p_event->is_action_pressed("ui_down", true)) { if (p_event->is_action_pressed("ui_down", true, true)) {
next = from->_get_focus_neighbor(SIDE_BOTTOM); next = from->_get_focus_neighbor(SIDE_BOTTOM);
} }