From e524cc7135134f1bdb5a074aa0fb7baf172d4fa4 Mon Sep 17 00:00:00 2001
From: Daniel J. Ramirez
Date: Thu, 9 Nov 2017 19:36:19 -0600
Subject: Fixed project manager and dialog fonts.

---
 editor/editor_themes.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'editor/editor_themes.cpp')

diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp
index 29859a1a5..220ee2b28 100644
--- a/editor/editor_themes.cpp
+++ b/editor/editor_themes.cpp
@@ -801,6 +801,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
 	theme->set_constant("close_h_ofs", "WindowDialog", 22 * EDSCALE);
 	theme->set_constant("close_v_ofs", "WindowDialog", 20 * EDSCALE);
 	theme->set_constant("title_height", "WindowDialog", 24 * EDSCALE);
+	theme->set_font("title_font", "WindowDialog", theme->get_font("title", "EditorFonts"));
 
 	// complex window, for now only Editor settings and Project settings
 	Ref<StyleBoxFlat> style_complex_window = style_window->duplicate();
-- 
cgit v1.2.3-70-g09d2


From 12251a3a15f537e6102a9ffe9a02a1b930d48e99 Mon Sep 17 00:00:00 2001
From: Daniel J. Ramirez
Date: Thu, 9 Nov 2017 20:45:18 -0600
Subject: Fix theme with custom font.

---
 editor/editor_fonts.cpp  | 5 -----
 editor/editor_themes.cpp | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'editor/editor_themes.cpp')

diff --git a/editor/editor_fonts.cpp b/editor/editor_fonts.cpp
index 360c3e416..7e20077fd 100644
--- a/editor/editor_fonts.cpp
+++ b/editor/editor_fonts.cpp
@@ -180,9 +180,4 @@ void editor_register_fonts(Ref<Theme> p_theme) {
 	df_output_code->set_font_data(dfmono);
 	MAKE_FALLBACKS(df_output_code);
 	p_theme->set_font("status_source", "EditorFonts", df_output_code);
-
-	//replace default theme
-	Ref<Texture> di;
-	Ref<StyleBox> ds;
-	fill_default_theme(p_theme, df, df_doc, di, ds, EDSCALE);
 }
diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp
index 220ee2b28..de0c3f55c 100644
--- a/editor/editor_themes.cpp
+++ b/editor/editor_themes.cpp
@@ -1045,7 +1045,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
 }
 
 Ref<Theme> create_custom_theme() {
-	Ref<Theme> theme;
+	Ref<Theme> theme = create_editor_theme();
 
 	String custom_theme = EditorSettings::get_singleton()->get("interface/theme/custom_theme");
 	if (custom_theme != "") {
-- 
cgit v1.2.3-70-g09d2