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

Merge pull request #2908 from neikeq/fix_editor_select

Browse Source 
Fix bugs caused by merged Script and Help tabs
This commit is contained in:
Rémi Verschelde 2015-11-25 00:25:55 +01:00
commit a1059e3e3e
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/editor/editor_help.cpp
View File

@ -271,7 +271,7 @@ void EditorHelpSearch::_confirmed() {
String mdata=ti->get_metadata(0); String mdata=ti->get_metadata(0);
emit_signal("go_to_help",mdata); emit_signal("go_to_help",mdata);
editor->call("_editor_select",3); // in case EditorHelpSearch beeen invoked on top of other editor window editor->call("_editor_select",2); // in case EditorHelpSearch beeen invoked on top of other editor window
// go to that // go to that
hide(); hide();
} }
@ -1057,7 +1057,7 @@ Error EditorHelp::_goto_desc(const String& p_class,int p_vscr) {
void EditorHelp::_request_help(const String& p_string) { void EditorHelp::_request_help(const String& p_string) {
Error err = _goto_desc(p_string); Error err = _goto_desc(p_string);
if (err==OK) { if (err==OK) {
editor->call("_editor_select",3); editor->call("_editor_select",2);
} }
//100 palabras //100 palabras
} }
@ -1358,7 +1358,6 @@ void EditorHelp::_notification(int p_what) {
// forward->set_icon(get_icon("Forward","EditorIcons")); // forward->set_icon(get_icon("Forward","EditorIcons"));
// back->set_icon(get_icon("Back","EditorIcons")); // back->set_icon(get_icon("Back","EditorIcons"));
_update_doc(); _update_doc();
editor->connect("request_help",this,"_request_help");
} break; } break;
} }

17
tools/editor/editor_node.cpp
View File

@ -169,9 +169,18 @@ void EditorNode::_unhandled_input(const InputEvent& p_event) {
if (!p_event.key.mod.shift && !p_event.key.mod.command) if (!p_event.key.mod.shift && !p_event.key.mod.command)
_editor_select(3); _editor_select(3);
break;*/ break;*/
case KEY_F1: _editor_select(0); break; case KEY_F1:
case KEY_F2: _editor_select(1); break; if (!p_event.key.mod.shift && !p_event.key.mod.command)
case KEY_F3: _editor_select(2); break; _editor_select(0);
break;
case KEY_F2:
if (!p_event.key.mod.shift && !p_event.key.mod.command)
_editor_select(1);
break;
case KEY_F3:
if (!p_event.key.mod.shift && !p_event.key.mod.command)
_editor_select(2);
break;
case KEY_F5: _menu_option_confirm((p_event.key.mod.control&&p_event.key.mod.shift)?RUN_PLAY_CUSTOM_SCENE:RUN_PLAY,true); break; case KEY_F5: _menu_option_confirm((p_event.key.mod.control&&p_event.key.mod.shift)?RUN_PLAY_CUSTOM_SCENE:RUN_PLAY,true); break;
case KEY_F6: _menu_option_confirm(RUN_PLAY_SCENE,true); break; case KEY_F6: _menu_option_confirm(RUN_PLAY_SCENE,true); break;
case KEY_F7: _menu_option_confirm(RUN_PAUSE,true); break; case KEY_F7: _menu_option_confirm(RUN_PAUSE,true); break;
@ -2519,7 +2528,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
case OBJECT_REQUEST_HELP: { case OBJECT_REQUEST_HELP: {
if (current) { if (current) {
_editor_select(3); _editor_select(2);
emit_signal("request_help",current->get_type()); emit_signal("request_help",current->get_type());
} }

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

@ -1387,6 +1387,7 @@ void ScriptEditor::_notification(int p_what) {
if (p_what==NOTIFICATION_READY) { if (p_what==NOTIFICATION_READY) {
get_tree()->connect("tree_changed",this,"_tree_changed"); get_tree()->connect("tree_changed",this,"_tree_changed");
editor->connect("request_help",this,"_request_help");
} }
if (p_what==NOTIFICATION_EXIT_TREE) { if (p_what==NOTIFICATION_EXIT_TREE) {
@ -2204,6 +2205,7 @@ void ScriptEditor::_bind_methods() {
ObjectTypeDB::bind_method("_script_split_dragged",&ScriptEditor::_script_split_dragged); ObjectTypeDB::bind_method("_script_split_dragged",&ScriptEditor::_script_split_dragged);
ObjectTypeDB::bind_method("_help_class_open",&ScriptEditor::_help_class_open); ObjectTypeDB::bind_method("_help_class_open",&ScriptEditor::_help_class_open);
ObjectTypeDB::bind_method("_help_class_goto",&ScriptEditor::_help_class_goto); ObjectTypeDB::bind_method("_help_class_goto",&ScriptEditor::_help_class_goto);
ObjectTypeDB::bind_method("_request_help",&ScriptEditor::_help_class_open);
ObjectTypeDB::bind_method("_history_forward",&ScriptEditor::_history_forward); ObjectTypeDB::bind_method("_history_forward",&ScriptEditor::_history_forward);
ObjectTypeDB::bind_method("_history_back",&ScriptEditor::_history_back); ObjectTypeDB::bind_method("_history_back",&ScriptEditor::_history_back);
} }