diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-11-10 09:53:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-10 09:53:48 +0100 |
| commit | e1a9ec4e19ec1b1f128ae58c4627864827fae1ba (patch) | |
| tree | a1ea2c4cedb780cc410fe128b1bf1f5c6d728f1a /editor | |
| parent | b51dca64a6f8700cdbcc07aa8940ed847316d4d8 (diff) | |
| parent | 5b40f9fddc9cb6923f494997e683a621fd31fd56 (diff) | |
Merge pull request #43397 from Calinou/fix-filesystem-copy-path-shortcut-conflict
Use Ctrl+Shift+C as the default FileSystem dock Copy Path shortcut
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/filesystem_dock.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp index 2052319e3e..ee0ee91893 100644 --- 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")); |