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_fonts.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'editor/editor_fonts.cpp') diff --git a/editor/editor_fonts.cpp b/editor/editor_fonts.cpp index 05f9da03e..360c3e416 100644 --- a/editor/editor_fonts.cpp +++ b/editor/editor_fonts.cpp @@ -122,20 +122,24 @@ void editor_register_fonts(Ref p_theme) { dfmono->set_font_ptr(_font_Hack_Regular, _font_Hack_Regular_size); //dfd->set_force_autohinter(true); //just looks better..i think? - MAKE_DEFAULT_FONT(df, int(EditorSettings::get_singleton()->get("interface/editor/font_size")) * EDSCALE); + int default_font_size = int(EditorSettings::get_singleton()->get("interface/editor/font_size")) * EDSCALE; + MAKE_DEFAULT_FONT(df, default_font_size); p_theme->set_default_theme_font(df); + MAKE_DEFAULT_FONT(df_title, default_font_size + 2 * EDSCALE); + p_theme->set_font("title", "EditorFonts", df_title); + //Ref 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 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 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")); - MAKE_DEFAULT_FONT(df_title, int(EDITOR_DEF("text_editor/help/help_title_font_size", 16)) * EDSCALE); + MAKE_DEFAULT_FONT(df_doc_title, int(EDITOR_DEF("text_editor/help/help_title_font_size", 16)) * EDSCALE); MAKE_DEFAULT_FONT(df_doc, int(EDITOR_DEF("text_editor/help/help_font_size", 14)) * EDSCALE); p_theme->set_font("doc", "EditorFonts", df_doc); - p_theme->set_font("doc_title", "EditorFonts", df_title); + p_theme->set_font("doc_title", "EditorFonts", df_doc_title); MAKE_DEFAULT_FONT(df_rulers, int(EDITOR_DEF("canvas_item_editor/rulers", 8)) * EDSCALE); p_theme->set_font("rulers", "EditorFonts", df_rulers); -- 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_fonts.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 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 di; - Ref 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 create_editor_theme(const Ref p_theme) { } Ref create_custom_theme() { - Ref theme; + Ref theme = create_editor_theme(); String custom_theme = EditorSettings::get_singleton()->get("interface/theme/custom_theme"); if (custom_theme != "") { -- cgit v1.2.3-70-g09d2