godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

Merge pull request #13977 from waldson/fix-stop-scene-always-active

Browse Source 
Fix stop button always enabled
This commit is contained in:
Andreas Haas
2017-12-05 07:59:52 +00:00
committed by GitHub
parent 5938466c84 606401331a
commit 74969b4535
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
editor/editor_node.cpp
View File

@@ -1674,7 +1674,6 @@ void EditorNode::_resource_selected(const RES &p_res, const String &p_property)
void EditorNode::_run(bool p_current, const String &p_custom) { void EditorNode::_run(bool p_current, const String &p_custom) {
if (editor_run.get_status() == EditorRun::STATUS_PLAY) { if (editor_run.get_status() == EditorRun::STATUS_PLAY) {
play_button->set_pressed(!_playing_edited); play_button->set_pressed(!_playing_edited);
play_scene_button->set_pressed(_playing_edited); play_scene_button->set_pressed(_playing_edited);
return; return;
@@ -1806,6 +1805,7 @@ void EditorNode::_run(bool p_current, const String &p_custom) {
play_button->set_pressed(true); play_button->set_pressed(true);
play_button->set_icon(gui_base->get_icon("Reload", "EditorIcons")); play_button->set_icon(gui_base->get_icon("Reload", "EditorIcons"));
} }
stop_button->set_disabled(false);
_playing_edited = p_current; _playing_edited = p_current;
} }
@@ -2277,6 +2277,8 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
play_scene_button->set_icon(gui_base->get_icon("PlayScene", "EditorIcons")); play_scene_button->set_icon(gui_base->get_icon("PlayScene", "EditorIcons"));
play_custom_scene_button->set_pressed(false); play_custom_scene_button->set_pressed(false);
play_custom_scene_button->set_icon(gui_base->get_icon("PlayCustom", "EditorIcons")); play_custom_scene_button->set_icon(gui_base->get_icon("PlayCustom", "EditorIcons"));
stop_button->set_disabled(true);
if (bool(EDITOR_DEF("run/output/always_close_output_on_stop", true))) { if (bool(EDITOR_DEF("run/output/always_close_output_on_stop", true))) {
for (int i = 0; i < bottom_panel_items.size(); i++) { for (int i = 0; i < bottom_panel_items.size(); i++) {
if (bottom_panel_items[i].control == log) { if (bottom_panel_items[i].control == log) {
@@ -5264,6 +5266,7 @@ EditorNode::EditorNode() {
stop_button->set_icon(gui_base->get_icon("Stop", "EditorIcons")); stop_button->set_icon(gui_base->get_icon("Stop", "EditorIcons"));
stop_button->connect("pressed", this, "_menu_option", make_binds(RUN_STOP)); stop_button->connect("pressed", this, "_menu_option", make_binds(RUN_STOP));
stop_button->set_tooltip(TTR("Stop the scene.")); stop_button->set_tooltip(TTR("Stop the scene."));
stop_button->set_disabled(true);
stop_button->set_shortcut(ED_SHORTCUT("editor/stop", TTR("Stop"), KEY_F8)); stop_button->set_shortcut(ED_SHORTCUT("editor/stop", TTR("Stop"), KEY_F8));
run_native = memnew(EditorRunNative); run_native = memnew(EditorRunNative);