diff options
| author | Rémi Verschelde | 2017-01-21 13:07:29 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2017-01-21 13:44:27 +0100 |
| commit | 7c47769aa22176de20a10639e758e01bba2e2a11 (patch) | |
| tree | 72e2fbd7f59c02690c9d4d459e77c212130ae745 /tools/editor/filesystem_dock.cpp | |
| parent | 0669c9816e679619753a3d8a966c73f3dd17f86c (diff) | |
| download | godot-7c47769aa22176de20a10639e758e01bba2e2a11.tar.gz godot-7c47769aa22176de20a10639e758e01bba2e2a11.tar.zst godot-7c47769aa22176de20a10639e758e01bba2e2a11.zip | |
Remove Quick Filter Files and fix FS search hotkey
The new Quick Filter Files behaviour since 8b47e26 had not been implemented,
so this implements it and makes it an editor hotkey instead of a menu entry.
Fixes #7582.
(cherry picked from commit c4d6e54e93431e94888c5594386bcd0aa22528ee)
Diffstat (limited to '')
| -rw-r--r-- | tools/editor/filesystem_dock.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/tools/editor/filesystem_dock.cpp b/tools/editor/filesystem_dock.cpp index 86c2fe2a6..e18e69251 100644 --- a/tools/editor/filesystem_dock.cpp +++ b/tools/editor/filesystem_dock.cpp @@ -168,7 +168,7 @@ void FileSystemDock::_notification(int p_what) { _update_tree(); //maybe it finished already if (EditorFileSystem::get_singleton()->is_scanning()) { - _set_scannig_mode(); + _set_scanning_mode(); } } break; @@ -660,7 +660,7 @@ void FileSystemDock::_fs_changed() { set_process(false); } -void FileSystemDock::_set_scannig_mode() { +void FileSystemDock::_set_scanning_mode() { split_box->hide(); button_hist_prev->set_disabled(true); @@ -1137,7 +1137,7 @@ void FileSystemDock::_search_changed(const String& p_text) { void FileSystemDock::_rescan() { - _set_scannig_mode(); + _set_scanning_mode(); EditorFileSystem::get_singleton()->scan(); } @@ -1149,6 +1149,14 @@ void FileSystemDock::fix_dependencies(const String& p_for_file) { void FileSystemDock::focus_on_filter() { + if (!search_box->is_visible()) { + // Tree mode, switch to files list with search box + tree->hide(); + file_list_vb->show(); + button_favorite->hide(); + } + + search_box->grab_focus(); } void FileSystemDock::set_display_mode(int p_mode) { |