Merge pull request #43397 from Calinou/fix-filesystem-copy-path-short…

…cut-conflict Use Ctrl+Shift+C as the default FileSystem dock Copy Path shortcut
godotengine · Nov 10, 2020 · e1a9ec4 · e1a9ec4
2 parents b51dca6 + 5b40f9f
commit e1a9ec4
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp
@@ -2665,7 +2665,8 @@ FileSystemDock::FileSystemDock(EditorNode *p_editor) {
 	editor = p_editor;
 	path = "res://";
 
-	ED_SHORTCUT("filesystem_dock/copy_path", TTR("Copy Path"), KEY_MASK_CMD | KEY_C);
+	// `KEY_MASK_CMD | KEY_C` conflicts with other editor shortcuts.
+	ED_SHORTCUT("filesystem_dock/copy_path", TTR("Copy Path"), KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_C);
 	ED_SHORTCUT("filesystem_dock/duplicate", TTR("Duplicate..."), KEY_MASK_CMD | KEY_D);
 	ED_SHORTCUT("filesystem_dock/delete", TTR("Delete"), KEY_DELETE);
 	ED_SHORTCUT("filesystem_dock/rename", TTR("Rename"));