Browse Source

Merge pull request #110737 from DeeJayLSP/no-embolden-when-variable

Editor font: do not embolden the Main Font if it's variable
Thaddeus Crews 2 weeks ago
parent
commit
c92430e84a
1 changed files with 6 additions and 2 deletions
  1. 6 2
      editor/themes/editor_fonts.cpp

+ 6 - 2
editor/themes/editor_fonts.cpp

@@ -286,7 +286,9 @@ void editor_register_fonts(const Ref<Theme> &p_theme) {
 			custom_font->set_fallbacks(fallback_custom);
 			custom_font->set_fallbacks(fallback_custom);
 		}
 		}
 		bold_fc->set_base_font(custom_font);
 		bold_fc->set_base_font(custom_font);
-		bold_fc->set_variation_embolden(embolden_strength);
+		if (!custom_font->get_supported_variation_list().has(TS->name_to_tag("wght"))) {
+			bold_fc->set_variation_embolden(embolden_strength);
+		}
 	} else {
 	} else {
 		EditorSettings::get_singleton()->set_manually("interface/editor/main_font_bold", "");
 		EditorSettings::get_singleton()->set_manually("interface/editor/main_font_bold", "");
 		bold_fc->set_base_font(default_font_bold);
 		bold_fc->set_base_font(default_font_bold);
@@ -313,7 +315,9 @@ void editor_register_fonts(const Ref<Theme> &p_theme) {
 			custom_font->set_fallbacks(fallback_custom);
 			custom_font->set_fallbacks(fallback_custom);
 		}
 		}
 		bold_fc_msdf->set_base_font(custom_font);
 		bold_fc_msdf->set_base_font(custom_font);
-		bold_fc_msdf->set_variation_embolden(embolden_strength);
+		if (!custom_font->get_supported_variation_list().has(TS->name_to_tag("wght"))) {
+			bold_fc_msdf->set_variation_embolden(embolden_strength);
+		}
 	} else {
 	} else {
 		EditorSettings::get_singleton()->set_manually("interface/editor/main_font_bold", "");
 		EditorSettings::get_singleton()->set_manually("interface/editor/main_font_bold", "");
 		bold_fc_msdf->set_base_font(default_font_bold_msdf);
 		bold_fc_msdf->set_base_font(default_font_bold_msdf);