diff options
| author | Paulb23 | 2016-03-30 19:32:45 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2016-04-06 19:39:36 +0200 |
| commit | bb6cfc130b4e2d64508c9cf5883ad3c3e9f83d9f (patch) | |
| tree | fedbceb82d8b95975b0f1d40813baa0a5b9c697d | |
| parent | b3891246e5349eae7700faa17348cfa3b9fd2c7f (diff) | |
| download | godot-bb6cfc130b4e2d64508c9cf5883ad3c3e9f83d9f.tar.gz godot-bb6cfc130b4e2d64508c9cf5883ad3c3e9f83d9f.tar.zst godot-bb6cfc130b4e2d64508c9cf5883ad3c3e9f83d9f.zip | |
Option to toggle syntax highlighting
(cherry picked from commit d78e98e2a49bf952dd3e38e4a8359903d03bf42c)
| -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 106193ac7..e498c0c37 100644 --- a/tools/editor/editor_settings.cpp +++ b/tools/editor/editor_settings.cpp @@ -485,6 +485,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 d74ce7ca3..fa1a9dfa7 100644 --- a/tools/editor/plugins/script_editor_plugin.cpp +++ b/tools/editor/plugins/script_editor_plugin.cpp @@ -298,7 +298,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()) { @@ -1923,6 +1922,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"), @@ -2064,6 +2064,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")); } |