diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-02-13 11:23:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-13 11:23:58 +0100 |
| commit | 81dee310e0dde043ec0c0b27325d28b915a1218e (patch) | |
| tree | 90309441f349edadf784f1c8790f85891cb06ceb | |
| parent | 61797707007662181e7e59cb281d2b1cc42bed2a (diff) | |
| parent | 4e96e043898cc3e37df9aea4758b765630c9e326 (diff) | |
Merge pull request #16373 from ianb96/scene_shortcut_disable
Disable scene tree shortcuts when in a text field
| -rw-r--r-- | editor/scene_tree_dock.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index 41ee5ab286..8506c75a68 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -67,6 +67,9 @@ void SceneTreeDock::_unhandled_key_input(Ref<InputEvent> p_event) { if (get_viewport()->get_modal_stack_top()) return; //ignore because of modal window + if (get_focus_owner() && get_focus_owner()->is_text_field()) + return; + if (!p_event->is_pressed() || p_event->is_echo()) return; |