From 8c328474f2b2397fb4bcc3fc84402a0305383da6 Mon Sep 17 00:00:00 2001 From: Paulb23 Date: Fri, 8 Apr 2016 20:05:50 +0100 Subject: [PATCH] Setting to change line number color --- scene/gui/text_edit.cpp | 5 ++--- scene/gui/text_edit.h | 1 + tools/editor/editor_settings.cpp | 1 + tools/editor/plugins/script_editor_plugin.cpp | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index a0887ffacd0..f7461a736c8 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -682,14 +682,12 @@ void TextEdit::_notification(int p_what) { } if (cache.line_number_w) { - Color fcol = cache.font_color; - fcol.a*=0.4; String fc = String::num(line+1); while (fc.length() < line_number_char_count) { fc="0"+fc; } - cache.font->draw(ci,Point2(cache.style_normal->get_margin(MARGIN_LEFT),ofs_y+cache.font->get_ascent()),fc,fcol); + cache.font->draw(ci,Point2(cache.style_normal->get_margin(MARGIN_LEFT),ofs_y+cache.font->get_ascent()),fc,cache.line_number_color); } const Map& cri_map=text.get_color_region_info(line); @@ -3083,6 +3081,7 @@ void TextEdit::_update_caches() { cache.style_focus=get_stylebox("focus"); cache.font=get_font("font"); cache.caret_color=get_color("caret_color"); + cache.line_number_color=get_color("line_number_color"); cache.font_color=get_color("font_color"); cache.font_selected_color=get_color("font_selected_color"); cache.keyword_color=get_color("keyword_color"); diff --git a/scene/gui/text_edit.h b/scene/gui/text_edit.h index 899ce533c45..09c2a4d7296 100644 --- a/scene/gui/text_edit.h +++ b/scene/gui/text_edit.h @@ -74,6 +74,7 @@ class TextEdit : public Control { Ref style_focus; Ref font; Color caret_color; + Color line_number_color; Color font_color; Color font_selected_color; Color keyword_color; diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp index 255ad40bcef..31da68cb8cd 100644 --- a/tools/editor/editor_settings.cpp +++ b/tools/editor/editor_settings.cpp @@ -393,6 +393,7 @@ void EditorSettings::_load_defaults(Ref p_extra_config) { set("global/show_script_in_scene_tabs",false); set("text_editor/background_color",Color::html("3b000000")); set("text_editor/caret_color",Color::html("aaaaaa")); + set("text_editor/line_number_color",Color::html("66aaaaaa")); set("text_editor/text_color",Color::html("aaaaaa")); set("text_editor/text_selected_color",Color::html("000000")); set("text_editor/keyword_color",Color::html("ffffb3")); diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp index 5f2efc8f032..6ed44901f17 100644 --- a/tools/editor/plugins/script_editor_plugin.cpp +++ b/tools/editor/plugins/script_editor_plugin.cpp @@ -288,6 +288,7 @@ void ScriptTextEditor::_load_theme_settings() { get_text_edit()->set_custom_bg_color(EDITOR_DEF("text_editor/background_color",Color(0,0,0,0))); get_text_edit()->add_color_override("font_color",EDITOR_DEF("text_editor/text_color",Color(0,0,0))); + get_text_edit()->add_color_override("line_number_color",EDITOR_DEF("text_editor/line_number_color",Color(0,0,0))); get_text_edit()->add_color_override("caret_color",EDITOR_DEF("text_editor/caret_color",Color(0,0,0))); get_text_edit()->add_color_override("font_selected_color",EDITOR_DEF("text_editor/text_selected_color",Color(1,1,1))); get_text_edit()->add_color_override("selection_color",EDITOR_DEF("text_editor/selection_color",Color(0.2,0.2,1)));