diff options
| author | Rémi Verschelde | 2017-02-12 23:16:14 +0100 |
|---|---|---|
| committer | GitHub | 2017-02-12 23:16:14 +0100 |
| commit | ceac8a780eb50ec7b28c8e7a824bf3ab3c1fd629 (patch) | |
| tree | 4716fcec167761b1bb38c74bfdd7aa7a21c89b59 /tools/editor | |
| parent | 530de920d48e43d96502c70928d13683e5083857 (diff) | |
| parent | 1bd1af776c111f1efdd9a3b0259d8f916c052ef2 (diff) | |
| download | godot-ceac8a780eb50ec7b28c8e7a824bf3ab3c1fd629.tar.gz godot-ceac8a780eb50ec7b28c8e7a824bf3ab3c1fd629.tar.zst godot-ceac8a780eb50ec7b28c8e7a824bf3ab3c1fd629.zip | |
Merge pull request #7740 from magyar123/master
Add editor option for closing the output when stopping the game.
Diffstat (limited to 'tools/editor')
| -rw-r--r-- | tools/editor/editor_node.cpp | 8 | ||||
| -rw-r--r-- | tools/editor/editor_settings.cpp | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 352b0818b..c70fbf05a 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -2603,6 +2603,14 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) { play_custom_scene_button->set_pressed(false); play_custom_scene_button->set_icon(gui_base->get_icon("PlayCustom","EditorIcons")); //pause_button->set_pressed(false); + if (bool(EDITOR_DEF("run/output/always_close_output_on_stop", true))) { + for(int i=0;i<bottom_panel_items.size();i++) { + if (bottom_panel_items[i].control==log) { + _bottom_panel_switch(false,i); + break; + } + } + } emit_signal("stop_pressed"); } break; diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp index 1cdc42654..ebac77699 100644 --- a/tools/editor/editor_settings.cpp +++ b/tools/editor/editor_settings.cpp @@ -655,6 +655,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { set("run/auto_save/save_before_running",true); set("run/output/always_clear_output_on_play",true); set("run/output/always_open_output_on_play",true); + set("run/output/always_close_output_on_stop",false); set("filesystem/resources/save_compressed_resources",true); set("filesystem/resources/auto_reload_modified_images",true); |