asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix import tab not updating when selecting in the tree view

Browse source
This commit is contained in:
groud 2018-09-24 14:26:26 +02:00
parent aaef640b8c
commit ed516a11ca
1 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
editor/filesystem_dock.cpp
View file

@ -395,6 +395,9 @@ void FileSystemDock::_notification(int p_what) {
} }
void FileSystemDock::_tree_multi_selected(Object *p_item, int p_column, bool p_selected) { void FileSystemDock::_tree_multi_selected(Object *p_item, int p_column, bool p_selected) {
// Update the import dock
import_dock_needs_update = true;
call_deferred("_update_import_dock");
// Return if we don't select something new // Return if we don't select something new
if (!p_selected) if (!p_selected)
@ -2122,15 +2125,33 @@ void FileSystemDock::_update_import_dock() {
if (!import_dock_needs_update) if (!import_dock_needs_update)
return; return;
//check import // List selected
Vector<String> imports; Vector<String> selected;
String import_type; if (display_mode_setting == DISPLAY_MODE_SETTING_TREE_ONLY) {
// Use the tree
selected = _tree_get_selected();
} else {
// Use the file list
for (int i = 0; i < files->get_item_count(); i++) { for (int i = 0; i < files->get_item_count(); i++) {
if (!files->is_selected(i)) if (!files->is_selected(i))
continue; continue;
String fpath = files->get_item_metadata(i); selected.push_back(files->get_item_metadata(i));
}
}
// Check import
Vector<String> imports;
String import_type;
for (int i = 0; i < selected.size(); i++) {
String fpath = selected[i];
if (fpath.ends_with("/")) {
imports.clear();
break;
}
if (!FileAccess::exists(fpath + ".import")) { if (!FileAccess::exists(fpath + ".import")) {
imports.clear(); imports.clear();
break; break;