Gremlinsoft
/
godot
forked from sascha/godot
2
0
Fork 0
Code Pull Requests Activity

Merge pull request #6614 from TheKK/issue5989 

Make FileDialog directory selection less misleading
3.0
Rémi Verschelde 2016-10-30 10:46:01 +07:00 committed by GitHub
parent 33766a4935 b40265492c
commit 426ff9e7ac
2 changed files with 45 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
scene/gui/file_dialog.cpp
Unescape Escape View File

@ -186,15 +186,17 @@ void FileDialog::_action_pressed() {
hide();
}else if (mode==MODE_OPEN_ANY || mode==MODE_OPEN_DIR) {
String path=dir_access->get_current_dir();
/*if (tree->get_selected()) {
Dictionary d = tree->get_selected()->get_metadata(0);
path=path.replace("\\","/");
if (TreeItem* item = tree->get_selected()) {
Dictionary d = item->get_metadata(0);
if (d["dir"]) {
path=path+"/"+String(d["name"]);
path=path.plus_file(d["name"]);
}
}*/
path=path.replace("\\","/");
}
emit_signal("dir_selected",path);
hide();
}
@ -348,18 +350,18 @@ void FileDialog::update_file_list() {
files.sort_custom<NoCaseComparator>();
while(!dirs.empty()) {
String& dir_name = dirs.front()->get();
TreeItem *ti=tree->create_item(root);
ti->set_text(0,dir_name+"/");
ti->set_icon(0,folder);
if (dirs.front()->get()!=".") {
TreeItem *ti=tree->create_item(root);
ti->set_text(0,dirs.front()->get()+"/");
ti->set_icon(0,folder);
Dictionary d;
d["name"]=dirs.front()->get();
d["dir"]=true;
ti->set_metadata(0,d);
}
dirs.pop_front();
Dictionary d;
d["name"]=dir_name;
d["dir"]=true;
ti->set_metadata(0,d);
dirs.pop_front();
}
dirs.clear();

47
tools/editor/editor_file_dialog.cpp
Unescape Escape View File

@ -336,15 +336,21 @@ void EditorFileDialog::_action_pressed() {
hide();
}else if (mode==MODE_OPEN_ANY || mode==MODE_OPEN_DIR) {
String path=dir_access->get_current_dir();
/*if (tree->get_selected()) {
Dictionary d = tree->get_selected()->get_metadata(0);
if (d["dir"]) {
path=path+"/"+String(d["name"]);
}
}*/
path=path.replace("\\","/");
for(int i=0;i<item_list->get_item_count();i++) {
if (item_list->is_selected(i)) {
Dictionary d=item_list->get_item_metadata(i);
if (d["dir"]) {
path=path.plus_file(d["name"]);
break;
}
}
}
_save_to_recent();
emit_signal("dir_selected",path);
hide();
@ -571,25 +577,26 @@ void EditorFileDialog::update_file_list() {
files.sort_custom<NoCaseComparator>();
while(!dirs.empty()) {
const String& dir_name=dirs.front()->get();
if (dirs.front()->get()!=".") {
item_list->add_item(dirs.front()->get()+"/");
if (display_mode==DISPLAY_THUMBNAILS) {
item_list->add_item(dir_name+"/");
item_list->set_item_icon(item_list->get_item_count()-1,folder_thumbnail);
} else {
if (display_mode==DISPLAY_THUMBNAILS) {
item_list->set_item_icon(item_list->get_item_count()-1,folder);
}
item_list->set_item_icon(item_list->get_item_count()-1,folder_thumbnail);
} else {
Dictionary d;
d["name"]=dirs.front()->get();
d["path"]=String();
d["dir"]=true;
item_list->set_item_metadata( item_list->get_item_count() -1, d);
item_list->set_item_icon(item_list->get_item_count()-1,folder);
}
dirs.pop_front();
Dictionary d;
d["name"]=dir_name;
d["path"]=String();
d["dir"]=true;
item_list->set_item_metadata( item_list->get_item_count() -1, d);
dirs.pop_front();
}
dirs.clear();