Merge pull request #3027 from TheHX/pr-project-manager-font

Fix project manager not picking up custom font

1 files changed, 13 insertions, 4 deletions

diff --git a/tools/editor/project_manager.cpp b/tools/editor/project_manager.cpp
index 04705017d2..4db56ea2f9 100644
--- a/tools/editor/project_manager.cpp
+++ b/tools/editor/project_manager.cpp
@@ -825,6 +825,19 @@ ProjectManager::ProjectManager() {
 	FileDialog::set_default_show_hidden_files(EditorSettings::get_singleton()->get("file_dialog/show_hidden_files"));
 
 	set_area_as_parent_rect();
+
+	Ref<Theme> theme = Ref<Theme>( memnew( Theme ) );
+	set_theme(theme);
+	editor_register_icons(theme);
+
+	String global_font = EditorSettings::get_singleton()->get("global/font");
+	if (global_font!="") {
+		Ref<Font> fnt = ResourceLoader::load(global_font);
+		if (fnt.is_valid()) {
+			theme->set_default_theme_font(fnt);
+		}
+	}
+
 	Panel *panel = memnew( Panel );
 	add_child(panel);
 	panel->set_area_as_parent_rect();
@@ -972,10 +985,6 @@ ProjectManager::ProjectManager() {
 	npdialog = memnew( NewProjectDialog );
 	add_child(npdialog);
 
-	Ref<Theme> theme = memnew( Theme );
-	editor_register_icons(theme);
-	set_theme(theme);
-
 	npdialog->connect("project_created", this,"_load_recent_projects");
 	_load_recent_projects();