summaryrefslogtreecommitdiff
path: root/tools/editor
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2016-04-06 18:42:13 +0200
committerRémi Verschelde <remi@verschelde.fr>2016-04-06 18:42:13 +0200
commitd6871ee847524aea3648095196fa726d52480db2 (patch)
tree1f8f492a4ac32e578dde59f31312562f0f1605a6 /tools/editor
parentaad31ee986e60183c708f0c6d31cc04e05f31916 (diff)
parentfc9f9adcb25cde432f888b8b29aee862eb0d8f95 (diff)
Merge pull request #4234 from Paulb23/member_variable_syntax_highlighting
Member variable syntax highlighting
Diffstat (limited to 'tools/editor')
-rw-r--r--tools/editor/editor_settings.cpp1
-rw-r--r--tools/editor/plugins/script_editor_plugin.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp
index a7c01e0f6f..4d7354a965 100644
--- a/tools/editor/editor_settings.cpp
+++ b/tools/editor/editor_settings.cpp
@@ -398,6 +398,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
set("text_editor/base_type_color",Color::html("a4ffd4"));
set("text_editor/engine_type_color",Color::html("83d3ff"));
set("text_editor/function_color",Color::html("66a2ce"));
+ set("text_editor/member_variable_color",Color::html("e64e59"));
set("text_editor/comment_color",Color::html("983d1b"));
set("text_editor/string_color",Color::html("ef6ebe"));
set("text_editor/number_color",Color::html("EB9532"));
diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp
index 1b059f3d27..1405bfab61 100644
--- a/tools/editor/plugins/script_editor_plugin.cpp
+++ b/tools/editor/plugins/script_editor_plugin.cpp
@@ -295,6 +295,7 @@ void ScriptTextEditor::_load_theme_settings() {
get_text_edit()->add_color_override("word_highlighted_color",EDITOR_DEF("text_editor/word_highlighted_color",Color(0.8,0.9,0.9,0.15)));
get_text_edit()->add_color_override("number_color",EDITOR_DEF("text_editor/number_color",Color(0.9,0.6,0.0,2)));
get_text_edit()->add_color_override("function_color",EDITOR_DEF("text_editor/function_color",Color(0.4,0.6,0.8)));
+ get_text_edit()->add_color_override("member_variable_color",EDITOR_DEF("text_editor/member_variable_color",Color(0.9,0.3,0.3)));
Color keyword_color= EDITOR_DEF("text_editor/keyword_color",Color(0.5,0.0,0.2));