summaryrefslogtreecommitdiff
path: root/editor/editor_node.h
diff options
context:
space:
mode:
authorThomas ten Cate <ttencate@gmail.com>2018-12-11 16:52:25 +0100
committerThomas ten Cate <ttencate@gmail.com>2019-06-25 14:57:44 +0200
commit05b67514a697b6dfb18b6c3f227aa622b32bb2eb (patch)
treedda1b51026c6011f3d9c7bdd0bee36de25e10550 /editor/editor_node.h
parent7a56873271c6254d7583cf8dad52c410d7edcdca (diff)
Make visibility of update spinner editor-wide, hidden by default
- Make visibility of the spinner and "update always" option editor-wide, rather than per-project metadata. - Add options "Show Update Spinner" and "Update Continuously" under Editor Settings > Interface > Editor. Both options are false by default. - Rename some variables and constants to be more consistent and clearer: "update always" -> "update continuously", "update changes" -> "update when changed", "update menu" -> "update spinner", "circle" -> "update spinner". Fixes #23738.
Diffstat (limited to 'editor/editor_node.h')
-rw-r--r--editor/editor_node.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/editor/editor_node.h b/editor/editor_node.h
index 46b9befcd6..8222f6213b 100644
--- a/editor/editor_node.h
+++ b/editor/editor_node.h
@@ -182,8 +182,8 @@ private:
RUN_DEBUG_NAVIGATION,
RUN_DEPLOY_REMOTE_DEBUG,
RUN_RELOAD_SCRIPTS,
- SETTINGS_UPDATE_ALWAYS,
- SETTINGS_UPDATE_CHANGES,
+ SETTINGS_UPDATE_CONTINUOUSLY,
+ SETTINGS_UPDATE_WHEN_CHANGED,
SETTINGS_UPDATE_SPINNER_HIDE,
SETTINGS_PREFERENCES,
SETTINGS_LAYOUT_SAVE,
@@ -328,7 +328,7 @@ private:
CheckButton *file_export_lib_merge;
LineEdit *file_export_password;
String current_path;
- MenuButton *update_menu;
+ MenuButton *update_spinner;
String defer_load_scene;
String defer_export;
@@ -394,9 +394,9 @@ private:
bool waiting_for_sources_changed;
- uint32_t circle_step_msec;
- uint64_t circle_step_frame;
- int circle_step;
+ uint32_t update_spinner_step_msec;
+ uint64_t update_spinner_step_frame;
+ int update_spinner_step;
Vector<EditorPlugin *> editor_plugins;
EditorPlugin *editor_plugin_screen;
@@ -629,6 +629,8 @@ private:
void _license_tree_selected();
+ void _update_update_spinner();
+
Vector<Ref<EditorResourceConversionPlugin> > resource_conversion_plugins;
PrintHandlerList print_handler;