aboutsummaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorRémi Verschelde2017-09-20 01:30:16 +0200
committerGitHub2017-09-20 01:30:16 +0200
commitcd2ffdc6725aa6f7a9a4af6fd5abcc4cafae61b4 (patch)
treed522c884bfd3fc023c07ad5f618c44034fbd273d /editor
parent593511b2b8d697d07d8185deebcb038c48d2dd1c (diff)
parent52c0550dd7fa101428eb4d9ecf4fe5b59e34abec (diff)
downloadgodot-cd2ffdc6725aa6f7a9a4af6fd5abcc4cafae61b4.tar.gz
godot-cd2ffdc6725aa6f7a9a4af6fd5abcc4cafae61b4.tar.zst
godot-cd2ffdc6725aa6f7a9a4af6fd5abcc4cafae61b4.zip
Merge pull request #11309 from djrm/pr_hack_font
Changed Mononoki font to Hack font
Diffstat (limited to 'editor')
-rw-r--r--editor/editor_fonts.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/editor/editor_fonts.cpp b/editor/editor_fonts.cpp
index 345c7b1f6..6e5726a16 100644
--- a/editor/editor_fonts.cpp
+++ b/editor/editor_fonts.cpp
@@ -119,7 +119,7 @@ void editor_register_fonts(Ref<Theme> p_theme) {
Ref<DynamicFontData> dfmono;
dfmono.instance();
- dfmono->set_font_ptr(_font_mononoki_Regular, _font_mononoki_Regular_size);
+ 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/font_size")) * EDSCALE);
@@ -130,9 +130,9 @@ void editor_register_fonts(Ref<Theme> p_theme) {
//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"));
- MAKE_DEFAULT_FONT(df_title, int(EDITOR_DEF("text_editor/help/help_title_font_size", 18)) * EDSCALE);
+ MAKE_DEFAULT_FONT(df_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", 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);
@@ -150,7 +150,7 @@ void editor_register_fonts(Ref<Theme> p_theme) {
Ref<DynamicFont> df_doc_code;
df_doc_code.instance();
- df_doc_code->set_size(int(EDITOR_DEF("text_editor/help/help_source_font_size", 18)) * EDSCALE);
+ df_doc_code->set_size(int(EDITOR_DEF("text_editor/help/help_source_font_size", 16)) * EDSCALE);
df_doc_code->set_spacing(DynamicFont::SPACING_TOP, -EDSCALE);
df_doc_code->set_spacing(DynamicFont::SPACING_BOTTOM, -EDSCALE);
df_doc_code->set_font_data(dfmono);