godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #24288 from ttencate/update_spinner_23738 

Make visibility of update spinner editor-wide, hidden by default
This commit is contained in:
Rémi Verschelde 2019-06-26 12:12:16 +02:00 committed by GitHub
parent 773b66dfd3 05b67514a6
commit cb8d95dd4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 55 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
editor/editor_node.cpp
View File

@ -260,24 +260,25 @@ void EditorNode::_notification(int p_what) {
last_checked_version = editor_data.get_undo_redo().get_version(); last_checked_version = editor_data.get_undo_redo().get_version();
} }
//update the circle // update the animation frame of the update spinner
uint64_t frame = Engine::get_singleton()->get_frames_drawn(); uint64_t frame = Engine::get_singleton()->get_frames_drawn();
uint32_t tick = OS::get_singleton()->get_ticks_msec(); uint32_t tick = OS::get_singleton()->get_ticks_msec();
if (frame != circle_step_frame && (tick - circle_step_msec) > (1000 / 8)) { if (frame != update_spinner_step_frame && (tick - update_spinner_step_msec) > (1000 / 8)) {
circle_step++; update_spinner_step++;
if (circle_step >= 8) if (update_spinner_step >= 8)
circle_step = 0; update_spinner_step = 0;
circle_step_msec = tick; update_spinner_step_msec = tick;
circle_step_frame = frame + 1; update_spinner_step_frame = frame + 1;
// update the circle itself only when its enabled // update the icon itself only when the spinner is visible
if (!update_menu->get_popup()->is_item_checked(3)) { if (EditorSettings::get_singleton()->get("interface/editor/show_update_spinner")) {
update_menu->set_icon(gui_base->get_icon("Progress" + itos(circle_step + 1), "EditorIcons")); update_spinner->set_icon(gui_base->get_icon("Progress" + itos(update_spinner_step + 1), "EditorIcons"));
} }
} }
editor_selection->update(); editor_selection->update();
scene_root->set_size_override(true, Size2(ProjectSettings::get_singleton()->get("display/window/size/width"), ProjectSettings::get_singleton()->get("display/window/size/height"))); scene_root->set_size_override(true, Size2(ProjectSettings::get_singleton()->get("display/window/size/width"), ProjectSettings::get_singleton()->get("display/window/size/height")));
@ -400,10 +401,8 @@ void EditorNode::_notification(int p_what) {
scene_tab_add->set_icon(gui_base->get_icon("Add", "EditorIcons")); scene_tab_add->set_icon(gui_base->get_icon("Add", "EditorIcons"));
// clear_button->set_icon(gui_base->get_icon("Close", "EditorIcons")); don't have access to that node. needs to become a class property // clear_button->set_icon(gui_base->get_icon("Close", "EditorIcons")); don't have access to that node. needs to become a class property
update_menu->set_icon(gui_base->get_icon("Collapse", "EditorIcons"));
dock_tab_move_left->set_icon(theme->get_icon("Back", "EditorIcons")); dock_tab_move_left->set_icon(theme->get_icon("Back", "EditorIcons"));
dock_tab_move_right->set_icon(theme->get_icon("Forward", "EditorIcons")); dock_tab_move_right->set_icon(theme->get_icon("Forward", "EditorIcons"));
update_menu->set_icon(gui_base->get_icon("Progress1", "EditorIcons"));
PopupMenu *p = help_menu->get_popup(); PopupMenu *p = help_menu->get_popup();
p->set_item_icon(p->get_item_index(HELP_SEARCH), gui_base->get_icon("HelpSearch", "EditorIcons")); p->set_item_icon(p->get_item_index(HELP_SEARCH), gui_base->get_icon("HelpSearch", "EditorIcons"));
@ -412,6 +411,8 @@ void EditorNode::_notification(int p_what) {
p->set_item_icon(p->get_item_index(HELP_ISSUES), gui_base->get_icon("Instance", "EditorIcons")); p->set_item_icon(p->get_item_index(HELP_ISSUES), gui_base->get_icon("Instance", "EditorIcons"));
p->set_item_icon(p->get_item_index(HELP_COMMUNITY), gui_base->get_icon("Instance", "EditorIcons")); p->set_item_icon(p->get_item_index(HELP_COMMUNITY), gui_base->get_icon("Instance", "EditorIcons"));
p->set_item_icon(p->get_item_index(HELP_ABOUT), gui_base->get_icon("Godot", "EditorIcons")); p->set_item_icon(p->get_item_index(HELP_ABOUT), gui_base->get_icon("Godot", "EditorIcons"));
_update_update_spinner();
} }
if (p_what == Control::NOTIFICATION_RESIZED) { if (p_what == Control::NOTIFICATION_RESIZED) {
@ -419,6 +420,17 @@ void EditorNode::_notification(int p_what) {
} }
} }
void EditorNode::_update_update_spinner() {
update_spinner->set_visible(EditorSettings::get_singleton()->get("interface/editor/show_update_spinner"));
bool update_continuously = EditorSettings::get_singleton()->get("interface/editor/update_continuously");
PopupMenu *update_popup = update_spinner->get_popup();
update_popup->set_item_checked(update_popup->get_item_index(SETTINGS_UPDATE_CONTINUOUSLY), update_continuously);
update_popup->set_item_checked(update_popup->get_item_index(SETTINGS_UPDATE_WHEN_CHANGED), !update_continuously);
OS::get_singleton()->set_low_processor_usage_mode(!update_continuously);
}
void EditorNode::_on_plugin_ready(Object *p_script, const String &p_activate_name) { void EditorNode::_on_plugin_ready(Object *p_script, const String &p_activate_name) {
Ref<Script> script = Object::cast_to<Script>(p_script); Ref<Script> script = Object::cast_to<Script>(p_script);
if (script.is_null()) if (script.is_null())
@ -2426,28 +2438,21 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
EditorSettings::get_singleton()->set_project_metadata("debug_options", "run_reload_scripts", !ischecked); EditorSettings::get_singleton()->set_project_metadata("debug_options", "run_reload_scripts", !ischecked);
} break; } break;
case SETTINGS_UPDATE_ALWAYS: { case SETTINGS_UPDATE_CONTINUOUSLY: {
update_menu->get_popup()->set_item_checked(0, true);
update_menu->get_popup()->set_item_checked(1, false);
OS::get_singleton()->set_low_processor_usage_mode(false);
EditorSettings::get_singleton()->set_project_metadata("editor_options", "update_always", true);
EditorSettings::get_singleton()->set("interface/editor/update_continuously", true);
_update_update_spinner();
show_accept(TTR("This option is deprecated. Situations where refresh must be forced are now considered a bug. Please report."), TTR("OK")); show_accept(TTR("This option is deprecated. Situations where refresh must be forced are now considered a bug. Please report."), TTR("OK"));
} break; } break;
case SETTINGS_UPDATE_CHANGES: { case SETTINGS_UPDATE_WHEN_CHANGED: {
update_menu->get_popup()->set_item_checked(0, false); EditorSettings::get_singleton()->set("interface/editor/update_continuously", false);
update_menu->get_popup()->set_item_checked(1, true); _update_update_spinner();
OS::get_singleton()->set_low_processor_usage_mode(true);
EditorSettings::get_singleton()->set_project_metadata("editor_options", "update_always", false);
} break; } break;
case SETTINGS_UPDATE_SPINNER_HIDE: { case SETTINGS_UPDATE_SPINNER_HIDE: {
update_menu->set_icon(gui_base->get_icon("Collapse", "EditorIcons")); EditorSettings::get_singleton()->set("interface/editor/show_update_spinner", false);
update_menu->get_popup()->toggle_item_checked(3); _update_update_spinner();
bool checked = update_menu->get_popup()->is_item_checked(3);
EditorSettings::get_singleton()->set_project_metadata("editor_options", "update_spinner_hide", checked);
} break; } break;
case SETTINGS_PREFERENCES: { case SETTINGS_PREFERENCES: {
@ -5440,6 +5445,8 @@ EditorNode::EditorNode() {
EDITOR_DEF("run/auto_save/save_before_running", true); EDITOR_DEF("run/auto_save/save_before_running", true);
EDITOR_DEF_RST("interface/editor/save_each_scene_on_quit", true); EDITOR_DEF_RST("interface/editor/save_each_scene_on_quit", true);
EDITOR_DEF("interface/editor/quit_confirmation", true); EDITOR_DEF("interface/editor/quit_confirmation", true);
EDITOR_DEF("interface/editor/show_update_spinner", false);
EDITOR_DEF("interface/editor/update_continuously", false);
EDITOR_DEF_RST("interface/scene_tabs/restore_scenes_on_load", false); EDITOR_DEF_RST("interface/scene_tabs/restore_scenes_on_load", false);
EDITOR_DEF_RST("interface/scene_tabs/show_thumbnail_on_hover", true); EDITOR_DEF_RST("interface/scene_tabs/show_thumbnail_on_hover", true);
EDITOR_DEF_RST("interface/inspector/capitalize_properties", true); EDITOR_DEF_RST("interface/inspector/capitalize_properties", true);
@ -6037,22 +6044,17 @@ EditorNode::EditorNode() {
layout_dialog->set_size(Size2(225, 270) * EDSCALE); layout_dialog->set_size(Size2(225, 270) * EDSCALE);
layout_dialog->connect("name_confirmed", this, "_dialog_action"); layout_dialog->connect("name_confirmed", this, "_dialog_action");
update_menu = memnew(MenuButton); update_spinner = memnew(MenuButton);
update_menu->set_tooltip(TTR("Spins when the editor window redraws.")); update_spinner->set_tooltip(TTR("Spins when the editor window redraws."));
right_menu_hb->add_child(update_menu); right_menu_hb->add_child(update_spinner);
update_menu->set_icon(gui_base->get_icon("Progress1", "EditorIcons")); update_spinner->set_icon(gui_base->get_icon("Progress1", "EditorIcons"));
update_menu->get_popup()->connect("id_pressed", this, "_menu_option"); update_spinner->get_popup()->connect("id_pressed", this, "_menu_option");
p = update_menu->get_popup(); p = update_spinner->get_popup();
p->add_radio_check_item(TTR("Update Always"), SETTINGS_UPDATE_ALWAYS); p->add_radio_check_item(TTR("Update Continuously"), SETTINGS_UPDATE_CONTINUOUSLY);
p->add_radio_check_item(TTR("Update Changes"), SETTINGS_UPDATE_CHANGES); p->add_radio_check_item(TTR("Update When Changed"), SETTINGS_UPDATE_WHEN_CHANGED);
p->add_separator(); p->add_separator();
p->add_check_item(TTR("Disable Update Spinner"), SETTINGS_UPDATE_SPINNER_HIDE); p->add_item(TTR("Hide Update Spinner"), SETTINGS_UPDATE_SPINNER_HIDE);
int update_always = EditorSettings::get_singleton()->get_project_metadata("editor_options", "update_always", false); _update_update_spinner();
int hide_spinner = EditorSettings::get_singleton()->get_project_metadata("editor_options", "update_spinner_hide", false);
_menu_option(update_always ? SETTINGS_UPDATE_ALWAYS : SETTINGS_UPDATE_CHANGES);
if (hide_spinner) {
_menu_option(SETTINGS_UPDATE_SPINNER_HIDE);
}
// Instantiate and place editor docks // Instantiate and place editor docks
@ -6341,9 +6343,9 @@ EditorNode::EditorNode() {
particles_mat_convert.instance(); particles_mat_convert.instance();
resource_conversion_plugins.push_back(particles_mat_convert); resource_conversion_plugins.push_back(particles_mat_convert);
} }
circle_step_msec = OS::get_singleton()->get_ticks_msec(); update_spinner_step_msec = OS::get_singleton()->get_ticks_msec();
circle_step_frame = Engine::get_singleton()->get_frames_drawn(); update_spinner_step_frame = Engine::get_singleton()->get_frames_drawn();
circle_step = 0; update_spinner_step = 0;
editor_plugin_screen = NULL; editor_plugin_screen = NULL;
editor_plugins_over = memnew(EditorPluginList); editor_plugins_over = memnew(EditorPluginList);

14
editor/editor_node.h
View File

@ -182,8 +182,8 @@ private:
RUN_DEBUG_NAVIGATION, RUN_DEBUG_NAVIGATION,
RUN_DEPLOY_REMOTE_DEBUG, RUN_DEPLOY_REMOTE_DEBUG,
RUN_RELOAD_SCRIPTS, RUN_RELOAD_SCRIPTS,
SETTINGS_UPDATE_ALWAYS, SETTINGS_UPDATE_CONTINUOUSLY,
SETTINGS_UPDATE_CHANGES, SETTINGS_UPDATE_WHEN_CHANGED,
SETTINGS_UPDATE_SPINNER_HIDE, SETTINGS_UPDATE_SPINNER_HIDE,
SETTINGS_PREFERENCES, SETTINGS_PREFERENCES,
SETTINGS_LAYOUT_SAVE, SETTINGS_LAYOUT_SAVE,
@ -328,7 +328,7 @@ private:
CheckButton *file_export_lib_merge; CheckButton *file_export_lib_merge;
LineEdit *file_export_password; LineEdit *file_export_password;
String current_path; String current_path;
MenuButton *update_menu; MenuButton *update_spinner;
String defer_load_scene; String defer_load_scene;
String defer_export; String defer_export;
@ -394,9 +394,9 @@ private:
bool waiting_for_sources_changed; bool waiting_for_sources_changed;
uint32_t circle_step_msec; uint32_t update_spinner_step_msec;
uint64_t circle_step_frame; uint64_t update_spinner_step_frame;
int circle_step; int update_spinner_step;
Vector<EditorPlugin *> editor_plugins; Vector<EditorPlugin *> editor_plugins;
EditorPlugin *editor_plugin_screen; EditorPlugin *editor_plugin_screen;
@ -629,6 +629,8 @@ private:
void _license_tree_selected(); void _license_tree_selected();
void _update_update_spinner();
Vector<Ref<EditorResourceConversionPlugin> > resource_conversion_plugins; Vector<Ref<EditorResourceConversionPlugin> > resource_conversion_plugins;
PrintHandlerList print_handler; PrintHandlerList print_handler;