1 files changed, 51 insertions, 6 deletions

diff --git a/tools/editor/editor_fonts.cpp b/tools/editor/editor_fonts.cpp
index a3ec08f986..e04dce294a 100644
--- a/tools/editor/editor_fonts.cpp
+++ b/tools/editor/editor_fonts.cpp
@@ -30,6 +30,9 @@
 #include "doc_font.h"
 #include "doc_title_font.h"
 #include "doc_code_font.h"
+#include "builtin_fonts.h"
+#include "editor_settings.h"
+#include "scene/resources/dynamic_font.h"
 
 static Ref<BitmapFont> make_font(int p_height,int p_ascent, int p_valign, int p_charcount, const int *p_chars,const Ref<Texture> &p_texture) {
 
@@ -64,12 +67,54 @@ static Ref<BitmapFont> make_font(int p_height,int p_ascent, int p_valign, int p_
 
 void editor_register_fonts(Ref<Theme> p_theme) {
 
+	Ref<DynamicFontData> dfd;
+	dfd.instance();
+	dfd->set_font_ptr(_font_droid_sans,_font_droid_sans_size);
+	dfd->set_force_autohinter(true); //just looks better..i think?
 
-	Ref<BitmapFont> doc_font = make_font(_bi_font_doc_font_height,_bi_font_doc_font_ascent,0,_bi_font_doc_font_charcount,_bi_font_doc_font_characters,p_theme->get_icon("DocFont","EditorIcons"));
-	Ref<BitmapFont> doc_code_font = make_font(_bi_font_doc_code_font_height,_bi_font_doc_code_font_ascent,0,_bi_font_doc_code_font_charcount,_bi_font_doc_code_font_characters,p_theme->get_icon("DocCodeFont","EditorIcons"));
-	Ref<BitmapFont> doc_title_font = make_font(_bi_font_doc_title_font_height,_bi_font_doc_title_font_ascent,0,_bi_font_doc_title_font_charcount,_bi_font_doc_title_font_characters,p_theme->get_icon("DocTitleFont","EditorIcons"));
-	p_theme->set_font("doc","EditorFonts",doc_font);
-	p_theme->set_font("doc_code","EditorFonts",doc_code_font);
-	p_theme->set_font("doc_title","EditorFonts",doc_title_font);
+	Ref<DynamicFontData> dfmono;
+	dfmono.instance();
+	dfmono->set_font_ptr(_font_source_code_pro,_font_source_code_pro_size);
+	//dfd->set_force_autohinter(true); //just looks better..i think?
+
+	Ref<DynamicFont> df;
+	df.instance();
+	df->set_size(int(EditorSettings::get_singleton()->get("global/font_size")));
+	df->set_font_data(dfd);
+
+
+	p_theme->set_default_theme_font(df);
+
+//	Ref<BitmapFont> doc_font = make_font(_bi_font_doc_font_height,_bi_font_doc_font_ascent,0,_bi_font_doc_font_charcount,_bi_font_doc_font_characters,p_theme->get_icon("DocFont","EditorIcons"));
+//	Ref<BitmapFont> doc_title_font = make_font(_bi_font_doc_title_font_height,_bi_font_doc_title_font_ascent,0,_bi_font_doc_title_font_charcount,_bi_font_doc_title_font_characters,p_theme->get_icon("DocTitleFont","EditorIcons"));
+//	Ref<BitmapFont> doc_code_font = make_font(_bi_font_doc_code_font_height,_bi_font_doc_code_font_ascent,0,_bi_font_doc_code_font_charcount,_bi_font_doc_code_font_characters,p_theme->get_icon("DocCodeFont","EditorIcons"));
+
+	Ref<DynamicFont> df_title;
+	df_title.instance();
+	df_title->set_size(int(EDITOR_DEF("help/help_title_font_size",18)));
+	df_title->set_font_data(dfd);
+
+	Ref<DynamicFont> df_doc;
+	df_doc.instance();
+	df_doc->set_size(int(EDITOR_DEF("help/help_font_size",16)));
+	df_doc->set_font_data(dfd);
+
+	p_theme->set_font("doc","EditorFonts",df_doc);
+	p_theme->set_font("doc_title","EditorFonts",df_title);
+
+
+	Ref<DynamicFont> df_code;
+	df_code.instance();
+	df_code->set_size(int(EditorSettings::get_singleton()->get("global/source_font_size")));
+	df_code->set_font_data(dfmono);
+
+	p_theme->set_font("source","EditorFonts",df_code);
+
+	Ref<DynamicFont> df_doc_code;
+	df_doc_code.instance();
+	df_doc_code->set_size(int(EDITOR_DEF("help/help_source_font_size",14)));
+	df_doc_code->set_font_data(dfmono);
+
+	p_theme->set_font("doc_source","EditorFonts",df_doc_code);
 
 }