seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A few small adjustments to file dialogs:

Browse Source 
a) Added Backspace key support for Tree-based file dialog.
b) Fixed issue inability to select a folder in project manager (always previous folder was selected instead).
c) Open Directory mode: changed "Open" to "Select Current Folder"
d) Block "Open" button when inappropriate content is selected (for example, file when in open folder mode, or folder when in open files mode)
This commit is contained in:
Dmitry Koteroff
2017-11-24 21:12:18 +03:00
parent 6086252f66
commit e3b0214f40
4 changed files with 81 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
scene/gui/file_dialog.cpp
View File

@ -85,6 +85,10 @@ void FileDialog::_unhandled_input(const Ref<InputEvent> &p_event) {
invalidate();
} break;
case KEY_BACKSPACE: {
_dir_entered("..");
} break;
default: { handled = false; }
}
@ -189,7 +193,7 @@ void FileDialog::_action_pressed() {
TreeItem *item = tree->get_selected();
if (item) {
Dictionary d = item->get_metadata(0);
if (d["dir"]) {
if (d["dir"] && d["name"] != "..") {
path = path.plus_file(d["name"]);
}
}
@ -272,6 +276,26 @@ void FileDialog::_cancel_pressed() {
hide();
}
bool FileDialog::_is_open_should_be_disabled() {
if (mode == MODE_OPEN_ANY || mode == MODE_SAVE_FILE)
return false;
TreeItem *ti = tree->get_selected();
// We have something that we can't select?
if (!ti)
return true;
Dictionary d = ti->get_metadata(0);
// Opening a file, but selected a folder? Forbidden.
if (((mode == MODE_OPEN_FILE || mode == MODE_OPEN_FILES) && d["dir"]) || // Flipped case, also forbidden.
(mode == MODE_OPEN_DIR && !d["dir"]))
return true;
return false;
}
void FileDialog::_tree_selected() {
TreeItem *ti = tree->get_selected();
@ -283,6 +307,8 @@ void FileDialog::_tree_selected() {
file->set_text(d["name"]);
}
get_ok()->set_disabled(_is_open_should_be_disabled());
}
void FileDialog::_tree_dc_selected() {
@ -563,7 +589,7 @@ void FileDialog::set_mode(Mode p_mode) {
makedir->hide();
break;
case MODE_OPEN_DIR:
get_ok()->set_text(RTR("Open"));
get_ok()->set_text(RTR("Select Current Folder"));
set_title(RTR("Open a Directory"));
makedir->show();
break;