godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-10 13:00:37 +00:00
Code Releases Wiki Activity

Fix switching between 2D/3D/Script

Browse Source
This commit is contained in:
neikeq
2015-11-25 00:07:32 +01:00
parent c731dd1ba6
commit bfe8df27bc
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/editor/editor_help.cpp
View File

@@ -263,7 +263,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();
} }
@@ -1049,7 +1049,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
} }

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());
} }