diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-02-02 08:12:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-02 08:12:46 +0100 |
| commit | 39f11ffc5145a534466b3be2651852a828e59707 (patch) | |
| tree | 3e5f9555d107556da5308c7720499c3cd80de546 /tools/editor | |
| parent | af6d59eed6a09bfd68ffbecb751f80ac49e5604c (diff) | |
| parent | 6b42cd5fe637d6d0fe30fa397eca659d295ad956 (diff) | |
Merge pull request #7666 from Paulb23/line_length_guideline
Fixed line lenght guideline, and added colour option
Diffstat (limited to 'tools/editor')
| -rw-r--r-- | tools/editor/editor_settings.cpp | 2 | ||||
| -rw-r--r-- | tools/editor/plugins/script_text_editor.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp index 822497fcab..1cdc426541 100644 --- a/tools/editor/editor_settings.cpp +++ b/tools/editor/editor_settings.cpp @@ -715,6 +715,7 @@ void EditorSettings::_load_default_text_editor_theme() { set("text_editor/highlighting/selection_color",Color::html("7b5dbe")); set("text_editor/highlighting/brace_mismatch_color",Color(1,0.2,0.2)); set("text_editor/highlighting/current_line_color",Color(0.3,0.5,0.8,0.15)); + set("text_editor/highlighting/line_length_guideline_color",Color(0.3,0.5,0.8,0.1)); set("text_editor/highlighting/mark_color", Color(1.0,0.4,0.4,0.4)); set("text_editor/highlighting/breakpoint_color", Color(0.8,0.8,0.4,0.2)); set("text_editor/highlighting/word_highlighted_color",Color(0.8,0.9,0.9,0.15)); @@ -972,6 +973,7 @@ bool EditorSettings::_save_text_editor_theme(String p_file) { cf->set_value(theme_section, "selection_color", ((Color)get("text_editor/highlighting/selection_color")).to_html()); cf->set_value(theme_section, "brace_mismatch_color", ((Color)get("text_editor/highlighting/brace_mismatch_color")).to_html()); cf->set_value(theme_section, "current_line_color", ((Color)get("text_editor/highlighting/current_line_color")).to_html()); + cf->set_value(theme_section, "line_length_guideline_color", ((Color)get("text_editor/highlighting/line_length_guideline_color")).to_html()); cf->set_value(theme_section, "mark_color", ((Color)get("text_editor/highlighting/mark_color")).to_html()); cf->set_value(theme_section, "breakpoint_color", ((Color)get("text_editor/highlighting/breakpoint_color")).to_html()); cf->set_value(theme_section, "word_highlighted_color", ((Color)get("text_editor/highlighting/word_highlighted_color")).to_html()); diff --git a/tools/editor/plugins/script_text_editor.cpp b/tools/editor/plugins/script_text_editor.cpp index e26a3b23bc..9ec6266419 100644 --- a/tools/editor/plugins/script_text_editor.cpp +++ b/tools/editor/plugins/script_text_editor.cpp @@ -115,6 +115,7 @@ void ScriptTextEditor::_load_theme_settings() { text_edit->add_color_override("selection_color",EDITOR_DEF("text_editor/highlighting/selection_color",Color(0.2,0.2,1))); text_edit->add_color_override("brace_mismatch_color",EDITOR_DEF("text_editor/highlighting/brace_mismatch_color",Color(1,0.2,0.2))); text_edit->add_color_override("current_line_color",EDITOR_DEF("text_editor/highlighting/current_line_color",Color(0.3,0.5,0.8,0.15))); + text_edit->add_color_override("line_length_guideline_color", EDITOR_DEF("text_editor/highlighting/line_length_guideline_color", Color(0,0,0))); text_edit->add_color_override("word_highlighted_color",EDITOR_DEF("text_editor/highlighting/word_highlighted_color",Color(0.8,0.9,0.9,0.15))); text_edit->add_color_override("number_color",EDITOR_DEF("text_editor/highlighting/number_color",Color(0.9,0.6,0.0,2))); text_edit->add_color_override("function_color",EDITOR_DEF("text_editor/highlighting/function_color",Color(0.4,0.6,0.8))); |