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

Merge pull request #17816 from NikodemL/fix_file_show_in_explorer 

FIX: FILE_SHOW_IN_EXPLORER now correctly shows the file's directory
This commit is contained in:
Rémi Verschelde 2018-04-04 12:31:05 +02:00 committed by GitHub
parent 1d4b0751fe 836565b249
commit d991e99321
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
editor/filesystem_dock.cpp
View File

@ -1034,8 +1034,19 @@ void FileSystemDock::_move_operation_confirm(const String &p_to_path) {
void FileSystemDock::_file_option(int p_option) { void FileSystemDock::_file_option(int p_option) {
switch (p_option) { switch (p_option) {
case FILE_SHOW_IN_EXPLORER: { case FILE_SHOW_IN_EXPLORER: {
String dir = ProjectSettings::get_singleton()->globalize_path(this->path);
OS::get_singleton()->shell_open(String("file://") + dir); String path = this->path;
// first try to grab directory from selected file, so that it works for searched files
int idx = files->get_current();
if (idx >= 0 && idx < files->get_item_count()) {
path = files->get_item_metadata(idx);
path = path.get_base_dir();
}
path = ProjectSettings::get_singleton()->globalize_path(path);
OS::get_singleton()->shell_open(String("file://") + path);
} break; } break;
case FILE_OPEN: { case FILE_OPEN: {
for (int i = 0; i < files->get_item_count(); i++) { for (int i = 0; i < files->get_item_count(); i++) {