Merge pull request #10985 from toger5/log_color_fix

fixed log colors
godotengine · Sep 5, 2017 · 286b0da · 286b0da
2 parents 2802dce + 18917ad
commit 286b0da
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/editor/editor_log.cpp b/editor/editor_log.cpp
@@ -59,7 +59,6 @@ void EditorLog::_notification(int p_what) {
 
 	if (p_what == NOTIFICATION_ENTER_TREE) {
 
-		log->add_color_override("default_color", get_color("font_color", "Tree"));
 		//button->set_icon(get_icon("Console","EditorIcons"));
 	}
 	if (p_what == EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED) {
@@ -91,7 +90,7 @@ void EditorLog::add_message(const String &p_msg, bool p_error) {
 
 	log->add_newline();
 	if (p_error) {
-		log->push_color(get_color("fg_error", "Editor"));
+		log->push_color(get_color("error_color", "Editor"));
 		Ref<Texture> icon = get_icon("Error", "EditorIcons");
 		log->add_image(icon);
 		//button->set_icon(icon);

diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp
@@ -466,8 +466,6 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
 	theme->set_color("prop_category", "Editor", prop_category_color);
 	theme->set_color("prop_section", "Editor", prop_section_color);
 	theme->set_color("prop_subsection", "Editor", prop_subsection_color);
-	theme->set_color("fg_selected", "Editor", HIGHLIGHT_COLOR_BG);
-	theme->set_color("fg_error", "Editor", error_color);
 	theme->set_color("drop_position_color", "Tree", highlight_color);
 
 	// ItemList