maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #23651 from Kanabenki/fix-filedialog-editor-focus

Browse source 
Prevent FileDialog from stealing focus when setting current file in editor
This commit is contained in:
Rémi Verschelde 2018-12-14 23:21:04 +01:00 committed by GitHub
parent a03b72956d cfb89b672e
commit 46f73c366d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scene/gui/file_dialog.cpp
View file

@ -29,6 +29,7 @@
/*************************************************************************/ /*************************************************************************/
#include "file_dialog.h" #include "file_dialog.h"
#include "core/os/keyboard.h" #include "core/os/keyboard.h"
#include "core/print_string.h" #include "core/print_string.h"
#include "scene/gui/label.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("."); int lp = p_file.find_last(".");
if (lp != -1) { if (lp != -1) {
file->select(0, lp); file->select(0, lp);
if (file->is_inside_tree()) if (file->is_inside_tree() && !get_tree()->is_node_being_edited(file))
file->grab_focus(); file->grab_focus();
} }
} }