mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-27 09:16:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove shortcut conflict

Browse Source
This commit is contained in:
Guilherme Felipe 2018-06-18 16:24:01 -03:00
parent db913cb9b8
commit 7c52824504
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -4351,7 +4351,7 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
snap_button->set_toggle_mode(true); snap_button->set_toggle_mode(true);
snap_button->connect("toggled", this, "_button_toggle_snap"); snap_button->connect("toggled", this, "_button_toggle_snap");
snap_button->set_tooltip(TTR("Toggle snapping.")); snap_button->set_tooltip(TTR("Toggle snapping."));
snap_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/use_snap", TTR("Use Snap"), KEY_S)); snap_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/use_snap", TTR("Use Snap"), KEY_MASK_SHIFT | KEY_S));
snap_config_menu = memnew(MenuButton); snap_config_menu = memnew(MenuButton);
hb->add_child(snap_config_menu); hb->add_child(snap_config_menu);