Merge pull request #44456 from univeous/allow_input_echo_in_ui_focus

allow input echo when changing ui focus
godotengine · Apr 8, 2021 · 0283bc8 · 0283bc8
2 parents fe6f226 + f5b5067
commit 0283bc8
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
@@ -2399,29 +2399,27 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
  if (from && p_event->is_pressed()) {
  Control *next = nullptr;
 
- Input *input = Input::get_singleton();
-
- if (p_event->is_action_pressed("ui_focus_next") && input->is_action_just_pressed("ui_focus_next")) {
+ if (p_event->is_action_pressed("ui_focus_next", true)) {
  next = from->find_next_valid_focus();
  }
 
- if (p_event->is_action_pressed("ui_focus_prev") && input->is_action_just_pressed("ui_focus_prev")) {
+ if (p_event->is_action_pressed("ui_focus_prev", true)) {
  next = from->find_prev_valid_focus();
  }
 
- if (!mods && p_event->is_action_pressed("ui_up") && input->is_action_just_pressed("ui_up")) {
+ if (!mods && p_event->is_action_pressed("ui_up", true)) {
  next = from->_get_focus_neighbor(SIDE_TOP);
  }
 
- if (!mods && p_event->is_action_pressed("ui_left") && input->is_action_just_pressed("ui_left")) {
+ if (!mods && p_event->is_action_pressed("ui_left", true)) {
  next = from->_get_focus_neighbor(SIDE_LEFT);
  }
 
- if (!mods && p_event->is_action_pressed("ui_right") && input->is_action_just_pressed("ui_right")) {
+ if (!mods && p_event->is_action_pressed("ui_right", true)) {
  next = from->_get_focus_neighbor(SIDE_RIGHT);
  }
 
- if (!mods && p_event->is_action_pressed("ui_down") && input->is_action_just_pressed("ui_down")) {
+ if (!mods && p_event->is_action_pressed("ui_down", true)) {
  next = from->_get_focus_neighbor(SIDE_BOTTOM);
  }