diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-08-06 21:04:11 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-06 21:04:11 -0300 |
| commit | 134b3edf5a34eb05322f064a9194c0ea81c39f6c (patch) | |
| tree | fc84a3e15c7ae3f8c8ea162a1ffb9f1471890956 /scene/gui/tree.cpp | |
| parent | 85945e4367c6c0759f855a3dfefe5941c3c07cd3 (diff) | |
| parent | 7b7c7c8dc0e3572a7d66d274b3e4db43695ce814 (diff) | |
Merge pull request #10123 from bojidar-bg/7695-key-kp-enter
Rename KEY_RETURN to KEY_ENTER and KEY_ENTER to KEY_KP_ENTER
Diffstat (limited to 'scene/gui/tree.cpp')
| -rw-r--r-- | scene/gui/tree.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index 0b57841be7..9499ba9dcd 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -1917,8 +1917,8 @@ int Tree::propagate_mouse_event(const Point2i &p_pos, int x_ofs, int y_ofs, bool void Tree::_text_editor_modal_close() { if (Input::get_singleton()->is_key_pressed(KEY_ESCAPE) || - Input::get_singleton()->is_key_pressed(KEY_ENTER) || - Input::get_singleton()->is_key_pressed(KEY_RETURN)) { + Input::get_singleton()->is_key_pressed(KEY_KP_ENTER) || + Input::get_singleton()->is_key_pressed(KEY_ENTER)) { return; } @@ -2237,8 +2237,8 @@ void Tree::_gui_input(Ref<InputEvent> p_event) { } break; case KEY_F2: - case KEY_RETURN: - case KEY_ENTER: { + case KEY_ENTER: + case KEY_KP_ENTER: { if (selected_item) { //bring up editor if possible |