diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-06-14 15:22:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-14 15:22:52 +0200 |
| commit | b412534e6f404dd4b0108a93915dbeada7d13a5c (patch) | |
| tree | 7c3c1b2fee90a9acc88e4f34d8cff8fb924fec45 /editor/editor_fonts.cpp | |
| parent | 578f8d7c43fca84fee51eb6e450907f89ba61dcb (diff) | |
| parent | c56ef88c5a41c45603b76b4e36d908ef653672a1 (diff) | |
Merge pull request #29779 from akien-mga/font-settings-cleanup
Fix help source font setting and related cleanup
Diffstat (limited to 'editor/editor_fonts.cpp')
| -rw-r--r-- | editor/editor_fonts.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/editor/editor_fonts.cpp b/editor/editor_fonts.cpp index cddabbc4e4..cf14cf3e00 100644 --- a/editor/editor_fonts.cpp +++ b/editor/editor_fonts.cpp @@ -206,7 +206,7 @@ void editor_register_fonts(Ref<Theme> p_theme) { dfmono->set_font_ptr(_font_Hack_Regular, _font_Hack_Regular_size); //dfd->set_force_autohinter(true); //just looks better..i think? - int default_font_size = int(EditorSettings::get_singleton()->get("interface/editor/main_font_size")) * EDSCALE; + int default_font_size = int(EDITOR_GET("interface/editor/main_font_size")) * EDSCALE; // Default font MAKE_DEFAULT_FONT(df, default_font_size); @@ -221,9 +221,9 @@ void editor_register_fonts(Ref<Theme> p_theme) { p_theme->set_font("title", "EditorFonts", df_title); // Doc font - MAKE_BOLD_FONT(df_doc_title, int(EDITOR_DEF("text_editor/help/help_title_font_size", 23)) * EDSCALE); + MAKE_BOLD_FONT(df_doc_title, int(EDITOR_GET("text_editor/help/help_title_font_size")) * EDSCALE); - MAKE_DEFAULT_FONT(df_doc, int(EDITOR_DEF("text_editor/help/help_font_size", 15)) * EDSCALE); + MAKE_DEFAULT_FONT(df_doc, int(EDITOR_GET("text_editor/help/help_font_size")) * EDSCALE); p_theme->set_font("doc", "EditorFonts", df_doc); p_theme->set_font("doc_title", "EditorFonts", df_doc_title); @@ -236,13 +236,13 @@ void editor_register_fonts(Ref<Theme> p_theme) { p_theme->set_font("rulers", "EditorFonts", df_rulers); // Code font - MAKE_SOURCE_FONT(df_code, int(EditorSettings::get_singleton()->get("interface/editor/code_font_size")) * EDSCALE); + MAKE_SOURCE_FONT(df_code, int(EDITOR_GET("interface/editor/code_font_size")) * EDSCALE); p_theme->set_font("source", "EditorFonts", df_code); - MAKE_SOURCE_FONT(df_expression, (int(EditorSettings::get_singleton()->get("interface/editor/code_font_size")) - 1) * EDSCALE); + MAKE_SOURCE_FONT(df_expression, (int(EDITOR_GET("interface/editor/code_font_size")) - 1) * EDSCALE); p_theme->set_font("expression", "EditorFonts", df_expression); - MAKE_SOURCE_FONT(df_output_code, int(EDITOR_DEF("run/output/font_size", 13)) * EDSCALE); + MAKE_SOURCE_FONT(df_output_code, int(EDITOR_GET("run/output/font_size")) * EDSCALE); p_theme->set_font("output_source", "EditorFonts", df_output_code); MAKE_SOURCE_FONT(df_text_editor_status_code, default_font_size); |