Merge pull request #10901 from toger5/script_background_cleanup

StyleBoxSupport for RichTextLabel and cleanup for script+docs backgrounds fixes #10685
This commit is contained in:
Rémi Verschelde 2017-09-04 08:05:17 +02:00 committed by GitHub
commit fb263b73aa
8 changed files with 33 additions and 46 deletions

View file

@ -75,14 +75,9 @@ void ScriptTextEditor::_load_theme_settings() {
text_edit->clear_colors();
/* color from color_theme or from editor color */
Color background_color = EDITOR_DEF("text_editor/highlighting/background_color", Color(0, 0, 0, 0));
if (EDITOR_DEF("text_editor/theme/adapted_code_editor_background_color", false))
background_color = get_color("dark_color_1", "Editor");
/* keyword color */
text_edit->add_color_override("background_color", background_color);
text_edit->add_color_override("background_color", EDITOR_DEF("text_editor/highlighting/background_color", Color(0, 0, 0, 0)));
text_edit->add_color_override("completion_background_color", EDITOR_DEF("text_editor/highlighting/completion_background_color", Color(0, 0, 0, 0)));
text_edit->add_color_override("completion_selected_color", EDITOR_DEF("text_editor/highlighting/completion_selected_color", Color::html("434244")));
text_edit->add_color_override("completion_existing_color", EDITOR_DEF("text_editor/highlighting/completion_existing_color", Color::html("21dfdfdf")));