diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-11-30 19:09:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-30 19:09:13 +0100 |
| commit | c653e9c47049057683020fb87e364f6c4d6989dc (patch) | |
| tree | 6124f1263d012a31ba56644d5032f3f0e31df3cd /editor | |
| parent | 193cc9a15703994278b51657d773ce1356e01caf (diff) | |
| parent | 1c546fdaeaa709cff29326941055102a2f8a9cd9 (diff) | |
Merge pull request #42825 from Chaosus/fix_grid_hotkey
Changes 'always show grid' hotkey to prevent conflict with 'pan mode'
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/plugins/canvas_item_editor_plugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index 5d9c46cdcb..b1bac34f46 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -5972,7 +5972,7 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) { p = view_menu->get_popup(); p->set_hide_on_checkable_item_selection(false); - p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_grid", TTR("Always Show Grid"), KEY_G), SHOW_GRID); + p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_grid", TTR("Always Show Grid"), KEY_MASK_CTRL | KEY_G), SHOW_GRID); p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_helpers", TTR("Show Helpers"), KEY_H), SHOW_HELPERS); p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_rulers", TTR("Show Rulers")), SHOW_RULERS); p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_guides", TTR("Show Guides"), KEY_Y), SHOW_GUIDES); |