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

Implement Shift+F1 as contextual help hotkey for script editor; There's 

one bug that when jump to help tab first time, the scroll position is
wrong.
This commit is contained in:
marynate 2014-05-06 17:43:14 +08:00
parent ab76f54196
commit 6c0f3f8d0c
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -394,7 +394,6 @@ ScriptTextEditor::ScriptTextEditor() {
/*** SCRIPT EDITOR ******/
String ScriptEditor::_get_debug_tooltip(const String&p_text,Node *_ste) {
ScriptTextEditor *ste=_ste->cast_to<ScriptTextEditor>();
@ -752,10 +751,12 @@ void ScriptEditor::_menu_option(int p_option) {
debugger->show();
}
} break;
case HELP_SELECTED: {
String selected = current->get_text_edit()->get_selection_text();
editor->call("_editor_select", 3);
editor->emit_signal("request_help", selected);
case HELP_CONTEXTUAL: {
String text = current->get_text_edit()->get_selection_text();
if (text == "")
text = current->get_text_edit()->get_word_under_cursor();
if (text != "")
editor->emit_signal("request_help", text);
} break;
case WINDOW_CLOSE: {
@ -1056,9 +1057,6 @@ void ScriptEditor::_bind_methods() {
ObjectTypeDB::bind_method("_show_debugger",&ScriptEditor::_show_debugger);
ObjectTypeDB::bind_method("_get_debug_tooltip",&ScriptEditor::_get_debug_tooltip);
}
@ -1370,7 +1368,7 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) {
help_menu = memnew( MenuButton );
menu_hb->add_child(help_menu);
help_menu->set_text("Help");
help_menu->get_popup()->add_item("Selected", HELP_SELECTED, KEY_MASK_CTRL|KEY_MASK_SHIFT|KEY_D);
help_menu->get_popup()->add_item("Contextual", HELP_CONTEXTUAL, KEY_MASK_SHIFT|KEY_F1);
help_menu->get_popup()->connect("item_pressed", this,"_menu_option");
tab_container->connect("tab_changed", this,"_tab_changed");
@ -1425,6 +1423,7 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) {
v_split->add_child(debugger);
debugger->connect("breaked",this,"_breaked");
// debugger_gui->hide();
}

3
tools/editor/plugins/script_editor_plugin.h
View File

@ -133,7 +133,7 @@ class ScriptEditor : public VBoxContainer {
DEBUG_BREAK,
DEBUG_CONTINUE,
DEBUG_SHOW,
HELP_SELECTED,
HELP_CONTEXTUAL,
WINDOW_CLOSE,
WINDOW_MOVE_LEFT,
WINDOW_MOVE_RIGHT,
@ -187,6 +187,7 @@ class ScriptEditor : public VBoxContainer {
void _breaked(bool p_breaked,bool p_can_debug);
void _show_debugger(bool p_show);
void _update_window_menu();
static ScriptEditor *script_editor;
protected:
void _notification(int p_what);