noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #59127 from bruvzg/custom_font_bold

Browse Source
This commit is contained in:
Rémi Verschelde
2022-03-14 08:30:25 +01:00
committed by GitHub
parent 07b10d6d4f 4f1660dad7
commit c7bfaf3310
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/editor_fonts.cpp
+7 -3
View File
@@ -206,7 +206,8 @@ void editor_register_fonts(Ref<Theme> p_theme) {
break; break;
} }
int default_font_size = int(EDITOR_GET("interface/editor/main_font_size")) * EDSCALE; const int default_font_size = int(EDITOR_GET("interface/editor/main_font_size")) * EDSCALE;
const float embolden_strength = 0.6;
String custom_font_path = EditorSettings::get_singleton()->get("interface/editor/main_font"); String custom_font_path = EditorSettings::get_singleton()->get("interface/editor/main_font");
Ref<FontData> CustomFont; Ref<FontData> CustomFont;
@@ -226,6 +227,11 @@ void editor_register_fonts(Ref<Theme> p_theme) {
EditorSettings::get_singleton()->set_manually("interface/editor/main_font_bold", ""); EditorSettings::get_singleton()->set_manually("interface/editor/main_font_bold", "");
} }
if (CustomFont.is_valid() && !CustomFontBold.is_valid()) {
CustomFontBold = CustomFont->duplicate();
CustomFontBold->set_embolden(embolden_strength);
}
/* Custom source code font */ /* Custom source code font */
String custom_font_path_source = EditorSettings::get_singleton()->get("interface/editor/code_font"); String custom_font_path_source = EditorSettings::get_singleton()->get("interface/editor/code_font");
@@ -268,8 +274,6 @@ void editor_register_fonts(Ref<Theme> p_theme) {
Ref<FontData> FontFallback = load_cached_internal_font(_font_DroidSansFallback, _font_DroidSansFallback_size, font_hinting, font_antialiased, true, font_subpixel_positioning); Ref<FontData> FontFallback = load_cached_internal_font(_font_DroidSansFallback, _font_DroidSansFallback_size, font_hinting, font_antialiased, true, font_subpixel_positioning);
Ref<FontData> FontJapanese = load_cached_internal_font(_font_DroidSansJapanese, _font_DroidSansJapanese_size, font_hinting, font_antialiased, true, font_subpixel_positioning); Ref<FontData> FontJapanese = load_cached_internal_font(_font_DroidSansJapanese, _font_DroidSansJapanese_size, font_hinting, font_antialiased, true, font_subpixel_positioning);
const float embolden_strength = 0.6;
Ref<FontData> FontFallbackBold = FontFallback->duplicate(); Ref<FontData> FontFallbackBold = FontFallback->duplicate();
FontFallbackBold->set_embolden(embolden_strength); FontFallbackBold->set_embolden(embolden_strength);
Ref<FontData> FontJapaneseBold = FontJapanese->duplicate(); Ref<FontData> FontJapaneseBold = FontJapanese->duplicate();