diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2018-03-13 12:54:43 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-13 12:54:43 +0100 |
commit | a3915d85976e047bf70ba3951af4f3f845856223 (patch) | |
tree | 910027a7884c562d97058c829183f1d075323ac9 /editor | |
parent | 8b629bbcbe5da04fed8dd4828b79ca24c0f168e1 (diff) | |
parent | 1cfc43421ee75304a63ef3905c0334f9d3faf302 (diff) |
Merge pull request #17154 from Hinsbart/fix_text_editor_settings
ScriptEditor: Use EditorSettings instead of hardcoded values in constructor.
Diffstat (limited to 'editor')
-rw-r--r-- | editor/plugins/script_editor_plugin.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index 261bece8f7..09388870f1 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -2577,8 +2577,8 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) { waiting_update_names = false; pending_auto_reload = false; auto_reload_running_scripts = false; - members_overview_enabled = true; - help_overview_enabled = true; + members_overview_enabled = EditorSettings::get_singleton()->get("text_editor/open_scripts/show_members_overview"); + help_overview_enabled = EditorSettings::get_singleton()->get("text_editor/help/show_help_index"); editor = p_editor; VBoxContainer *main_container = memnew(VBoxContainer); @@ -2820,9 +2820,9 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) { //debugger_gui->hide(); edit_pass = 0; - trim_trailing_whitespace_on_save = false; - convert_indent_on_save = false; - use_space_indentation = false; + trim_trailing_whitespace_on_save = EditorSettings::get_singleton()->get("text_editor/files/trim_trailing_whitespace_on_save"); + convert_indent_on_save = EditorSettings::get_singleton()->get("text_editor/indent/convert_indent_on_save"); + use_space_indentation = EditorSettings::get_singleton()->get("text_editor/indent/type"); ScriptServer::edit_request_func = _open_script_request; |