Prechádzať zdrojové kódy

Allow selection of option 'Open in File Manager' even when a file/folder is not explicitly selected.

(cherry picked from commit b7348419a3c65d0228a79c959d9cb4e039862721)
SaracenOne 3 rokov pred
rodič
commit
37910dd10f
1 zmenil súbory, kde vykonal 6 pridanie a 0 odobranie
  1. 6 0
      editor/filesystem_dock.cpp

+ 6 - 0
editor/filesystem_dock.cpp

@@ -2456,6 +2456,7 @@ void FileSystemDock::_file_and_folders_fill_popup(PopupMenu *p_popup, Vector<Str
 		String fpath = p_paths[0];
 		String item_text = fpath.ends_with("/") ? TTR("Open in File Manager") : TTR("Show in File Manager");
 		p_popup->add_icon_item(get_icon("Filesystem", "EditorIcons"), item_text, FILE_SHOW_IN_EXPLORER);
+		path = fpath;
 	}
 }
 
@@ -2490,6 +2491,9 @@ void FileSystemDock::_tree_rmb_empty(const Vector2 &p_pos) {
 	tree_popup->add_icon_item(get_icon("PackedScene", "EditorIcons"), TTR("New Scene..."), FILE_NEW_SCENE);
 	tree_popup->add_icon_item(get_icon("Script", "EditorIcons"), TTR("New Script..."), FILE_NEW_SCRIPT);
 	tree_popup->add_icon_item(get_icon("Object", "EditorIcons"), TTR("New Resource..."), FILE_NEW_RESOURCE);
+	tree_popup->add_separator();
+	tree_popup->add_icon_item(get_icon("Filesystem", "EditorIcons"), TTR("Open in File Manager"), FILE_SHOW_IN_EXPLORER);
+
 	tree_popup->set_position(tree->get_global_position() + p_pos);
 	tree_popup->popup();
 }
@@ -2528,6 +2532,8 @@ void FileSystemDock::_file_list_rmb_pressed(const Vector2 &p_pos) {
 		return;
 	}
 
+	path = current_path->get_text();
+
 	file_list_popup->clear();
 	file_list_popup->set_size(Size2(1, 1));