diff options
| author | Paulb23 <p_batty@hotmail.co.uk> | 2016-03-30 19:32:45 +0100 |
|---|---|---|
| committer | Paulb23 <p_batty@hotmail.co.uk> | 2016-04-06 18:27:58 +0100 |
| commit | d78e98e2a49bf952dd3e38e4a8359903d03bf42c (patch) | |
| tree | 9938bf6509986382c386b803c407814ba3de1157 | |
| parent | d5191a610b9beb833cd9fc0e6607cfa95365be64 (diff) | |
Option to toggle syntax highlighting
| -rw-r--r-- | tools/editor/editor_settings.cpp | 2 | ||||
| -rw-r--r-- | tools/editor/plugins/script_editor_plugin.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp index 8402a60438..255ad40bce 100644 --- a/tools/editor/editor_settings.cpp +++ b/tools/editor/editor_settings.cpp @@ -409,6 +409,8 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { set("text_editor/current_line_color",Color(0.3,0.5,0.8,0.15)); set("text_editor/word_highlighted_color",Color(0.8,0.9,0.9,0.15)); + set("text_editor/syntax_highlighting", true); + set("text_editor/highlight_all_occurrences", true); set("text_editor/scroll_past_end_of_file", false); diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp index 625dcd697f..30b75e8dcb 100644 --- a/tools/editor/plugins/script_editor_plugin.cpp +++ b/tools/editor/plugins/script_editor_plugin.cpp @@ -300,7 +300,6 @@ void ScriptTextEditor::_load_theme_settings() { Color keyword_color= EDITOR_DEF("text_editor/keyword_color",Color(0.5,0.0,0.2)); - get_text_edit()->set_syntax_coloring(true); List<String> keywords; script->get_language()->get_reserved_words(&keywords); for(List<String>::Element *E=keywords.front();E;E=E->next()) { @@ -1950,6 +1949,7 @@ void ScriptEditor::edit(const Ref<Script>& p_script) { ste->get_text_edit()->set_tab_size(EditorSettings::get_singleton()->get("text_editor/tab_size")); ste->get_text_edit()->set_draw_tabs(EditorSettings::get_singleton()->get("text_editor/draw_tabs")); ste->get_text_edit()->set_show_line_numbers(EditorSettings::get_singleton()->get("text_editor/show_line_numbers")); + ste->get_text_edit()->set_syntax_coloring(EditorSettings::get_singleton()->get("text_editor/syntax_highlighting")); ste->get_text_edit()->set_highlight_all_occurrences(EditorSettings::get_singleton()->get("text_editor/highlight_all_occurrences")); ste->get_text_edit()->set_callhint_settings( EditorSettings::get_singleton()->get("text_editor/put_callhint_tooltip_below_current_line"), @@ -2091,6 +2091,7 @@ void ScriptEditor::_editor_settings_changed() { ste->get_text_edit()->set_tab_size(EditorSettings::get_singleton()->get("text_editor/tab_size")); ste->get_text_edit()->set_draw_tabs(EditorSettings::get_singleton()->get("text_editor/draw_tabs")); ste->get_text_edit()->set_show_line_numbers(EditorSettings::get_singleton()->get("text_editor/show_line_numbers")); + ste->get_text_edit()->set_syntax_coloring(EditorSettings::get_singleton()->get("text_editor/syntax_highlighting")); ste->get_text_edit()->set_highlight_all_occurrences(EditorSettings::get_singleton()->get("text_editor/highlight_all_occurrences")); } |