diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-01-17 22:54:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-17 22:54:42 +0100 |
| commit | 798246c34b1a83339a6c7c72618529f28ffb1e4e (patch) | |
| tree | 8708976a898a6b71e9a0e81eed234f6728bc79d1 /editor/filesystem_dock.h | |
| parent | e0336996ce2a593716f4f47ca5102077d397af94 (diff) | |
| parent | d4de7cf186ec04f8f05954add759c8f79ea67154 (diff) | |
Merge pull request #25076 from groud/fix_filesystem_dock
Fixes crash in the Filesystem dock
Diffstat (limited to 'editor/filesystem_dock.h')
| -rw-r--r-- | editor/filesystem_dock.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/editor/filesystem_dock.h b/editor/filesystem_dock.h index 1f8ae698a3..237413acc4 100644 --- a/editor/filesystem_dock.h +++ b/editor/filesystem_dock.h @@ -178,9 +178,10 @@ private: bool import_dock_needs_update; Ref<Texture> _get_tree_item_icon(EditorFileSystemDirectory *p_dir, int p_idx); - bool _create_tree(TreeItem *p_parent, EditorFileSystemDirectory *p_dir, Vector<String> &uncollapsed_paths); + bool _create_tree(TreeItem *p_parent, EditorFileSystemDirectory *p_dir, Vector<String> &uncollapsed_paths, bool p_select_in_favorites); Vector<String> _compute_uncollapsed_paths(); - void _update_tree(const Vector<String> p_uncollapsed_paths = Vector<String>(), bool p_uncollapse_root = false); + void _update_tree(const Vector<String> p_uncollapsed_paths = Vector<String>(), bool p_uncollapse_root = false, bool p_select_in_favorites = false); + void _navigate_to_path(const String &p_path, bool p_select_in_favorites = false); void _file_list_gui_input(Ref<InputEvent> p_event); void _tree_gui_input(Ref<InputEvent> p_event); @@ -192,7 +193,7 @@ private: void _tree_toggle_collapsed(); - void _select_file(const String p_path); + void _select_file(const String p_path, bool p_select_in_favorites = false); void _tree_activate_file(); void _file_list_activate_file(int p_idx); void _file_multi_selected(int p_index, bool p_selected); |