diff options
| author | J08nY | 2016-10-01 16:15:07 +0200 |
|---|---|---|
| committer | Rémi Verschelde | 2016-10-09 17:41:04 +0200 |
| commit | 1ae1deabfa8b22651866d5e76d31077ba43112cf (patch) | |
| tree | 9b68168fdab16211f89f08579f719dacce817b17 /tools/editor/editor_node.cpp | |
| parent | 22680a30f1a0e883e3b8b40b524c230173d008c4 (diff) | |
| download | godot-1ae1deabfa8b22651866d5e76d31077ba43112cf.tar.gz godot-1ae1deabfa8b22651866d5e76d31077ba43112cf.tar.zst godot-1ae1deabfa8b22651866d5e76d31077ba43112cf.zip | |
editor_node: add an option to stop the update spinner from spinning, fixes #6653
(cherry picked from commit 4527fbcfa11c8e5fe618ce862d641c63b0204301)
Diffstat (limited to 'tools/editor/editor_node.cpp')
| -rw-r--r-- | tools/editor/editor_node.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 6039f67f1..42b9de840 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -276,10 +276,12 @@ void EditorNode::_notification(int p_what) { circle_step=0; circle_step_msec=tick; - circle_step_frame=frame+1; - - update_menu->set_icon(gui_base->get_icon("Progress"+itos(circle_step+1),"EditorIcons")); + circle_step_frame=frame+1; + // update the circle itself only when its enabled + if (!update_menu->get_popup()->is_item_checked(3)){ + update_menu->set_icon(gui_base->get_icon("Progress"+itos(circle_step+1),"EditorIcons")); + } } scene_root->set_size_override(true,Size2(Globals::get_singleton()->get("display/width"),Globals::get_singleton()->get("display/height"))); @@ -2684,7 +2686,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) { } break; case RUN_PLAY_NATIVE: { - + bool autosave = EDITOR_DEF("run/auto_save_before_running",true); if (autosave) { _menu_option_confirm(FILE_SAVE_ALL_SCENES, false); @@ -2802,6 +2804,10 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) { update_menu->get_popup()->set_item_checked(1,true); OS::get_singleton()->set_low_processor_usage_mode(true); } break; + case SETTINGS_UPDATE_SPINNER_HIDE: { + update_menu->set_icon(gui_base->get_icon("Collapse","EditorIcons")); + update_menu->get_popup()->toggle_item_checked(3); + } break; case SETTINGS_PREFERENCES: { settings_config_dialog->popup_edit_settings(); @@ -6000,6 +6006,8 @@ EditorNode::EditorNode() { p=update_menu->get_popup(); p->add_check_item(TTR("Update Always"),SETTINGS_UPDATE_ALWAYS); p->add_check_item(TTR("Update Changes"),SETTINGS_UPDATE_CHANGES); + p->add_separator(); + p->add_check_item(TTR("Disable Update Spinner"),SETTINGS_UPDATE_SPINNER_HIDE); p->set_item_checked(1,true); //sources_button->connect(); |