diff options
| author | neikeq | 2015-11-25 00:07:32 +0100 |
|---|---|---|
| committer | neikeq | 2015-11-25 00:07:32 +0100 |
| commit | bfe8df27bc2f2777c5e6636827e5430f95c90562 (patch) | |
| tree | da9dfbb1eaed30dfdb9bd466008d2bc324451923 /tools/editor/editor_node.cpp | |
| parent | c731dd1ba68604ff7e97915e2b9d3011e818ca03 (diff) | |
| download | godot-bfe8df27bc2f2777c5e6636827e5430f95c90562.tar.gz godot-bfe8df27bc2f2777c5e6636827e5430f95c90562.tar.zst godot-bfe8df27bc2f2777c5e6636827e5430f95c90562.zip | |
Fix switching between 2D/3D/Script
Diffstat (limited to '')
| -rw-r--r-- | tools/editor/editor_node.cpp | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 4e2259288..01e53ead1 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -169,9 +169,18 @@ void EditorNode::_unhandled_input(const InputEvent& p_event) { if (!p_event.key.mod.shift && !p_event.key.mod.command) _editor_select(3); break;*/ - case KEY_F1: _editor_select(0); break; - case KEY_F2: _editor_select(1); break; - case KEY_F3: _editor_select(2); break; + case KEY_F1: + if (!p_event.key.mod.shift && !p_event.key.mod.command) + _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_F6: _menu_option_confirm(RUN_PLAY_SCENE,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: { if (current) { - _editor_select(3); + _editor_select(2); emit_signal("request_help",current->get_type()); } |