godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-22 15:06:45 +00:00
Code Releases Wiki Activity

Added completion font colors

Browse Source
This commit is contained in:
Paulb23
2016-07-11 14:25:56 +01:00
parent 8e5c40b364
commit a9956be63d
5 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scene/gui/text_edit.cpp
View File

@@ -1111,7 +1111,7 @@ void TextEdit::_notification(int p_what) {
int l = line_from + i; int l = line_from + i;
ERR_CONTINUE( l < 0 || l>= completion_options.size()); ERR_CONTINUE( l < 0 || l>= completion_options.size());
Color text_color = cache.font_color; Color text_color = cache.completion_font_color;
for(int j=0;j<color_regions.size();j++) { for(int j=0;j<color_regions.size();j++) {
if (completion_options[l].begins_with(color_regions[j].begin_key)) { if (completion_options[l].begins_with(color_regions[j].begin_key)) {
text_color=color_regions[j].color; text_color=color_regions[j].color;
@@ -3312,6 +3312,7 @@ void TextEdit::_update_caches() {
cache.completion_background_color=get_color("completion_background_color"); cache.completion_background_color=get_color("completion_background_color");
cache.completion_selected_color=get_color("completion_selected_color"); cache.completion_selected_color=get_color("completion_selected_color");
cache.completion_existing_color=get_color("completion_existing_color"); cache.completion_existing_color=get_color("completion_existing_color");
cache.completion_font_color=get_color("completion_font_color");
cache.font=get_font("font"); cache.font=get_font("font");
cache.caret_color=get_color("caret_color"); cache.caret_color=get_color("caret_color");
cache.line_number_color=get_color("line_number_color"); cache.line_number_color=get_color("line_number_color");

1
scene/gui/text_edit.h
View File

@@ -77,6 +77,7 @@ class TextEdit : public Control {
Color completion_background_color; Color completion_background_color;
Color completion_selected_color; Color completion_selected_color;
Color completion_existing_color; Color completion_existing_color;
Color completion_font_color;
Color caret_color; Color caret_color;
Color line_number_color; Color line_number_color;
Color font_color; Color font_color;

2
tools/editor/editor_settings.cpp
View File

@@ -684,6 +684,7 @@ void EditorSettings::_load_default_text_editor_theme() {
set("text_editor/completion_selected_color", Color::html("434244")); set("text_editor/completion_selected_color", Color::html("434244"));
set("text_editor/completion_existing_color", Color::html("21dfdfdf")); set("text_editor/completion_existing_color", Color::html("21dfdfdf"));
set("text_editor/completion_scroll_color", Color::html("ffffff")); set("text_editor/completion_scroll_color", Color::html("ffffff"));
set("text_editor/completion_font_color", Color::html("aaaaaa"));
set("text_editor/caret_color",Color::html("aaaaaa")); set("text_editor/caret_color",Color::html("aaaaaa"));
set("text_editor/line_number_color",Color::html("66aaaaaa")); set("text_editor/line_number_color",Color::html("66aaaaaa"));
set("text_editor/text_color",Color::html("aaaaaa")); set("text_editor/text_color",Color::html("aaaaaa"));
@@ -920,6 +921,7 @@ bool EditorSettings::_save_text_editor_theme(String p_file) {
cf->set_value(theme_section, "completion_selected_color", ((Color)get("text_editor/completion_selected_color")).to_html()); cf->set_value(theme_section, "completion_selected_color", ((Color)get("text_editor/completion_selected_color")).to_html());
cf->set_value(theme_section, "completion_existing_color", ((Color)get("text_editor/completion_existing_color")).to_html()); cf->set_value(theme_section, "completion_existing_color", ((Color)get("text_editor/completion_existing_color")).to_html());
cf->set_value(theme_section, "completion_scroll_color", ((Color)get("text_editor/completion_scroll_color")).to_html()); cf->set_value(theme_section, "completion_scroll_color", ((Color)get("text_editor/completion_scroll_color")).to_html());
cf->set_value(theme_section, "completion_font_color", ((Color)get("text_editor/completion_font_color")).to_html());
cf->set_value(theme_section, "caret_color", ((Color)get("text_editor/caret_color")).to_html()); cf->set_value(theme_section, "caret_color", ((Color)get("text_editor/caret_color")).to_html());
cf->set_value(theme_section, "line_number_color", ((Color)get("text_editor/line_number_color")).to_html()); cf->set_value(theme_section, "line_number_color", ((Color)get("text_editor/line_number_color")).to_html());
cf->set_value(theme_section, "text_color", ((Color)get("text_editor/text_color")).to_html()); cf->set_value(theme_section, "text_color", ((Color)get("text_editor/text_color")).to_html());

1
tools/editor/plugins/script_editor_plugin.cpp
View File

@@ -313,6 +313,7 @@ void ScriptTextEditor::_load_theme_settings() {
get_text_edit()->add_color_override("completion_selected_color", EDITOR_DEF("text_editor/completion_selected_color", Color::html("434244"))); get_text_edit()->add_color_override("completion_selected_color", EDITOR_DEF("text_editor/completion_selected_color", Color::html("434244")));
get_text_edit()->add_color_override("completion_existing_color", EDITOR_DEF("text_editor/completion_existing_color", Color::html("21dfdfdf"))); get_text_edit()->add_color_override("completion_existing_color", EDITOR_DEF("text_editor/completion_existing_color", Color::html("21dfdfdf")));
get_text_edit()->add_color_override("completion_scroll_color", EDITOR_DEF("text_editor/completion_scroll_color", Color::html("ffffff"))); get_text_edit()->add_color_override("completion_scroll_color", EDITOR_DEF("text_editor/completion_scroll_color", Color::html("ffffff")));
get_text_edit()->add_color_override("completion_font_color", EDITOR_DEF("text_editor/completion_font_color", Color::html("aaaaaa")));
get_text_edit()->add_color_override("font_color",EDITOR_DEF("text_editor/text_color",Color(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("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("caret_color",EDITOR_DEF("text_editor/caret_color",Color(0,0,0)));

1
tools/editor/plugins/shader_editor_plugin.cpp
View File

@@ -82,6 +82,7 @@ void ShaderTextEditor::_load_theme_settings() {
get_text_edit()->add_color_override("completion_selected_color", EDITOR_DEF("text_editor/completion_selected_color", Color::html("434244"))); get_text_edit()->add_color_override("completion_selected_color", EDITOR_DEF("text_editor/completion_selected_color", Color::html("434244")));
get_text_edit()->add_color_override("completion_existing_color", EDITOR_DEF("text_editor/completion_existing_color", Color::html("21dfdfdf"))); get_text_edit()->add_color_override("completion_existing_color", EDITOR_DEF("text_editor/completion_existing_color", Color::html("21dfdfdf")));
get_text_edit()->add_color_override("completion_scroll_color", EDITOR_DEF("text_editor/completion_scroll_color", Color::html("ffffff"))); get_text_edit()->add_color_override("completion_scroll_color", EDITOR_DEF("text_editor/completion_scroll_color", Color::html("ffffff")));
get_text_edit()->add_color_override("completion_font_color", EDITOR_DEF("text_editor/completion_font_color", Color::html("aaaaaa")));
get_text_edit()->add_color_override("font_color",EDITOR_DEF("text_editor/text_color",Color(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("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("caret_color",EDITOR_DEF("text_editor/caret_color",Color(0,0,0)));