diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2018-04-08 11:36:55 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-08 11:36:55 -0300 |
| commit | 2ba01613a3a77a212af83034311015c91b0c6759 (patch) | |
| tree | 98258e3bce55155ad669e2902801f17dfa5633f2 /editor/filesystem_dock.h | |
| parent | a6c9ccf0075aec6790fbe938bac8b434e5db01f8 (diff) | |
| parent | bfae02c4ce34d425f5341f9bff2f036bdabe78ee (diff) | |
Merge pull request #17123 from Jason0214/BugFix_UpdataFavoriteListWhenMoveOrRenameDir
Editor: update favortite_dirs after move or rename a file in filesytem_dock
Diffstat (limited to 'editor/filesystem_dock.h')
| -rw-r--r-- | editor/filesystem_dock.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/editor/filesystem_dock.h b/editor/filesystem_dock.h index 377316d1ba..c8448a1022 100644 --- a/editor/filesystem_dock.h +++ b/editor/filesystem_dock.h @@ -176,12 +176,13 @@ private: void _file_selected(); void _dir_selected(); - void _get_all_files_in_dir(EditorFileSystemDirectory *efsd, Vector<String> &files) const; + void _get_all_items_in_dir(EditorFileSystemDirectory *efsd, Vector<String> &files, Vector<String> &folders) const; void _find_remaps(EditorFileSystemDirectory *efsd, const Map<String, String> &renames, Vector<String> &to_remaps) const; - void _try_move_item(const FileOrFolder &p_item, const String &p_new_path, Map<String, String> &p_renames) const; + void _try_move_item(const FileOrFolder &p_item, const String &p_new_path, Map<String, String> &p_file_renames, Map<String, String> &p_folder_renames) const; void _try_duplicate_item(const FileOrFolder &p_item, const String &p_new_path) const; void _update_dependencies_after_move(const Map<String, String> &p_renames) const; void _update_resource_paths_after_move(const Map<String, String> &p_renames) const; + void _update_favorite_dirs_list_after_move(const Map<String, String> &p_renames) const; void _make_dir_confirm(); void _rename_operation_confirm(); |