diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-12-14 23:21:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-14 23:21:04 +0100 |
| commit | 46f73c366df4377a69c26ee295db26956a90531b (patch) | |
| tree | 748c313a62bff4610bcd4156ca3140615a8122b0 | |
| parent | a03b72956db9ed3a9db219271959e7daae0e3664 (diff) | |
| parent | cfb89b672e3d1c52e16771237489c82603148c02 (diff) | |
| download | redot-engine-46f73c366df4377a69c26ee295db26956a90531b.tar.gz | |
Merge pull request #23651 from Kanabenki/fix-filedialog-editor-focus
Prevent FileDialog from stealing focus when setting current file in editor
| -rw-r--r-- | scene/gui/file_dialog.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp index 1e9f4df4a3..a869f7cfcd 100644 --- a/scene/gui/file_dialog.cpp +++ b/scene/gui/file_dialog.cpp @@ -29,6 +29,7 @@ /*************************************************************************/ #include "file_dialog.h" + #include "core/os/keyboard.h" #include "core/print_string.h" #include "scene/gui/label.h" @@ -596,7 +597,7 @@ void FileDialog::set_current_file(const String &p_file) { int lp = p_file.find_last("."); if (lp != -1) { file->select(0, lp); - if (file->is_inside_tree()) + if (file->is_inside_tree() && !get_tree()->is_node_being_edited(file)) file->grab_focus(); } } |