godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #985 from adolson/toggle-comment-shortcut-fix 

change shortcut for toggle-comment to Ctrl+K
This commit is contained in:
Juan Linietsky 2014-12-18 09:58:13 -02:00
parent 35b0b3bc1d 1a6628f5a3
commit 04362defe7
2 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scene/gui/text_edit.cpp
View File

@ -1911,27 +1911,6 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
} break;
case KEY_K:{
if (!k.mod.command || k.mod.shift || k.mod.alt) {
scancode_handled=false;
break;
}
else {
if (selection.active) {
int ini = selection.from_line;
int end = selection.to_line;
for (int i=ini; i<= end; i++)
{
_insert_text(i,0,"#");
}
}
else{
_insert_text(cursor.line,0,"#");
}
update();
}
break;}
case KEY_U:{
if (!k.mod.command || k.mod.shift || k.mod.alt) {
scancode_handled=false;

2
tools/editor/plugins/script_editor_plugin.cpp
View File

@ -1599,7 +1599,7 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) {
edit_menu->get_popup()->add_item("Move Down",EDIT_MOVE_LINE_DOWN,KEY_MASK_ALT|KEY_DOWN);
edit_menu->get_popup()->add_item("Indent Left",EDIT_INDENT_LEFT,KEY_MASK_ALT|KEY_LEFT);
edit_menu->get_popup()->add_item("Indent Right",EDIT_INDENT_RIGHT,KEY_MASK_ALT|KEY_RIGHT);
edit_menu->get_popup()->add_item("Toggle Comment",EDIT_TOGGLE_COMMENT,KEY_MASK_CMD|KEY_SLASH);
edit_menu->get_popup()->add_item("Toggle Comment",EDIT_TOGGLE_COMMENT,KEY_MASK_CMD|KEY_K);
edit_menu->get_popup()->add_item("Clone Down",EDIT_CLONE_DOWN,KEY_MASK_CMD|KEY_B);
edit_menu->get_popup()->add_separator();
edit_menu->get_popup()->add_item("Complete Symbol",EDIT_COMPLETE,KEY_MASK_CMD|KEY_SPACE);