godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct typo that broke custom selected font color 

Change several font_selected_color to font_color_selected; the actual name of the override

(cherry picked from commit 7142064110)
This commit is contained in:
Gwyneth Lowe 2019-06-24 00:17:27 -05:00 committed by Rémi Verschelde
parent e7e7d17f6b
commit 7a9eb587fd
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/plugins/script_text_editor.cpp
View File

@ -165,7 +165,7 @@ void ScriptTextEditor::_load_theme_settings() {
text_edit->add_color_override("safe_line_number_color", safe_line_number_color); text_edit->add_color_override("safe_line_number_color", safe_line_number_color);
text_edit->add_color_override("caret_color", caret_color); text_edit->add_color_override("caret_color", caret_color);
text_edit->add_color_override("caret_background_color", caret_background_color); text_edit->add_color_override("caret_background_color", caret_background_color);
text_edit->add_color_override("font_selected_color", text_selected_color); text_edit->add_color_override("font_color_selected", text_selected_color);
text_edit->add_color_override("selection_color", selection_color); text_edit->add_color_override("selection_color", selection_color);
text_edit->add_color_override("brace_mismatch_color", brace_mismatch_color); text_edit->add_color_override("brace_mismatch_color", brace_mismatch_color);
text_edit->add_color_override("current_line_color", current_line_color); text_edit->add_color_override("current_line_color", current_line_color);

2
editor/plugins/shader_editor_plugin.cpp
View File

@ -102,7 +102,7 @@ void ShaderTextEditor::_load_theme_settings() {
get_text_edit()->add_color_override("line_number_color", line_number_color); get_text_edit()->add_color_override("line_number_color", line_number_color);
get_text_edit()->add_color_override("caret_color", caret_color); get_text_edit()->add_color_override("caret_color", caret_color);
get_text_edit()->add_color_override("caret_background_color", caret_background_color); get_text_edit()->add_color_override("caret_background_color", caret_background_color);
get_text_edit()->add_color_override("font_selected_color", text_selected_color); get_text_edit()->add_color_override("font_color_selected", text_selected_color);
get_text_edit()->add_color_override("selection_color", selection_color); get_text_edit()->add_color_override("selection_color", selection_color);
get_text_edit()->add_color_override("brace_mismatch_color", brace_mismatch_color); get_text_edit()->add_color_override("brace_mismatch_color", brace_mismatch_color);
get_text_edit()->add_color_override("current_line_color", current_line_color); get_text_edit()->add_color_override("current_line_color", current_line_color);

2
editor/plugins/text_editor.cpp
View File

@ -115,7 +115,7 @@ void TextEditor::_load_theme_settings() {
text_edit->add_color_override("line_number_color", line_number_color); text_edit->add_color_override("line_number_color", line_number_color);
text_edit->add_color_override("caret_color", caret_color); text_edit->add_color_override("caret_color", caret_color);
text_edit->add_color_override("caret_background_color", caret_background_color); text_edit->add_color_override("caret_background_color", caret_background_color);
text_edit->add_color_override("font_selected_color", text_selected_color); text_edit->add_color_override("font_color_selected", text_selected_color);
text_edit->add_color_override("selection_color", selection_color); text_edit->add_color_override("selection_color", selection_color);
text_edit->add_color_override("brace_mismatch_color", brace_mismatch_color); text_edit->add_color_override("brace_mismatch_color", brace_mismatch_color);
text_edit->add_color_override("current_line_color", current_line_color); text_edit->add_color_override("current_line_color", current_line_color);

12
scene/gui/text_edit.cpp
View File

@ -1095,7 +1095,7 @@ void TextEdit::_notification(int p_what) {
if (brace_open_mismatch) if (brace_open_mismatch)
color = cache.brace_mismatch_color; color = cache.brace_mismatch_color;
drawer.draw_char(ci, Point2i(char_ofs + char_margin + ofs_x, yofs + ascent), '_', str[j + 1], in_selection && override_selected_font_color ? cache.font_selected_color : color); drawer.draw_char(ci, Point2i(char_ofs + char_margin + ofs_x, yofs + ascent), '_', str[j + 1], in_selection && override_selected_font_color ? cache.font_color_selected : color);
} }
if ((brace_close_match_line == line && brace_close_match_column == last_wrap_column + j) || if ((brace_close_match_line == line && brace_close_match_column == last_wrap_column + j) ||
@ -1103,7 +1103,7 @@ void TextEdit::_notification(int p_what) {
if (brace_close_mismatch) if (brace_close_mismatch)
color = cache.brace_mismatch_color; color = cache.brace_mismatch_color;
drawer.draw_char(ci, Point2i(char_ofs + char_margin + ofs_x, yofs + ascent), '_', str[j + 1], in_selection && override_selected_font_color ? cache.font_selected_color : color); drawer.draw_char(ci, Point2i(char_ofs + char_margin + ofs_x, yofs + ascent), '_', str[j + 1], in_selection && override_selected_font_color ? cache.font_color_selected : color);
} }
} }
@ -1175,18 +1175,18 @@ void TextEdit::_notification(int p_what) {
if (str[j] >= 32) { if (str[j] >= 32) {
int yofs = ofs_y + (get_row_height() - cache.font->get_height()) / 2; int yofs = ofs_y + (get_row_height() - cache.font->get_height()) / 2;
int w = drawer.draw_char(ci, Point2i(char_ofs + char_margin + ofs_x, yofs + ascent), str[j], str[j + 1], in_selection && override_selected_font_color ? cache.font_selected_color : color); int w = drawer.draw_char(ci, Point2i(char_ofs + char_margin + ofs_x, yofs + ascent), str[j], str[j + 1], in_selection && override_selected_font_color ? cache.font_color_selected : color);
if (underlined) { if (underlined) {
float line_width = 1.0; float line_width = 1.0;
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
line_width *= EDSCALE; line_width *= EDSCALE;
#endif #endif
draw_rect(Rect2(char_ofs + char_margin + ofs_x, yofs + ascent + 2, w, line_width), in_selection && override_selected_font_color ? cache.font_selected_color : color); draw_rect(Rect2(char_ofs + char_margin + ofs_x, yofs + ascent + 2, w, line_width), in_selection && override_selected_font_color ? cache.font_color_selected : color);
} }
} else if (draw_tabs && str[j] == '\t') { } else if (draw_tabs && str[j] == '\t') {
int yofs = (get_row_height() - cache.tab_icon->get_height()) / 2; int yofs = (get_row_height() - cache.tab_icon->get_height()) / 2;
cache.tab_icon->draw(ci, Point2(char_ofs + char_margin + ofs_x, ofs_y + yofs), in_selection && override_selected_font_color ? cache.font_selected_color : color); cache.tab_icon->draw(ci, Point2(char_ofs + char_margin + ofs_x, ofs_y + yofs), in_selection && override_selected_font_color ? cache.font_color_selected : color);
} }
char_ofs += char_w; char_ofs += char_w;
@ -4333,7 +4333,7 @@ void TextEdit::_update_caches() {
cache.line_number_color = get_color("line_number_color"); cache.line_number_color = get_color("line_number_color");
cache.safe_line_number_color = get_color("safe_line_number_color"); cache.safe_line_number_color = get_color("safe_line_number_color");
cache.font_color = get_color("font_color"); cache.font_color = get_color("font_color");
cache.font_selected_color = get_color("font_selected_color"); cache.font_color_selected = get_color("font_color_selected");
cache.keyword_color = get_color("keyword_color"); cache.keyword_color = get_color("keyword_color");
cache.function_color = get_color("function_color"); cache.function_color = get_color("function_color");
cache.member_variable_color = get_color("member_variable_color"); cache.member_variable_color = get_color("member_variable_color");

2
scene/gui/text_edit.h
View File

@ -170,7 +170,7 @@ private:
Color line_number_color; Color line_number_color;
Color safe_line_number_color; Color safe_line_number_color;
Color font_color; Color font_color;
Color font_selected_color; Color font_color_selected;
Color keyword_color; Color keyword_color;
Color number_color; Color number_color;
Color function_color; Color function_color;