Replace editor font to NotoSans for Latin, Arabic, Hebrew, Thai

1 files changed, 39 insertions, 39 deletions

diff --git a/editor/editor_fonts.cpp b/editor/editor_fonts.cpp
index c4ac4cbca5..22a9c84d21 100644
--- a/editor/editor_fonts.cpp
+++ b/editor/editor_fonts.cpp
@@ -65,52 +65,52 @@ static Ref<BitmapFont> make_font(int p_height, int p_ascent, int p_valign, int p
 	return font;
 }
 
-#define MAKE_FALLBACKS(m_name)               \
-	m_name->add_fallback(DroidSansFallback); \
-	m_name->add_fallback(DroidSansJapanese); \
-	m_name->add_fallback(DroidSansArabic);   \
-	m_name->add_fallback(DroidSansHebrew);   \
-	m_name->add_fallback(DroidSansThai);
-
-#define MAKE_DROID_SANS(m_name, m_size) \
-	Ref<DynamicFont> m_name;            \
-	m_name.instance();                  \
-	m_name->set_size(m_size);           \
-	m_name->set_font_data(DroidSans);   \
+#define MAKE_FALLBACKS(m_name)          \
+	m_name->add_fallback(FontArabic);   \
+	m_name->add_fallback(FontHebrew);   \
+	m_name->add_fallback(FontThai);     \
+	m_name->add_fallback(FontJapanese); \
+	m_name->add_fallback(FontFallback);
+
+#define MAKE_DEFAULT_FONT(m_name, m_size) \
+	Ref<DynamicFont> m_name;              \
+	m_name.instance();                    \
+	m_name->set_size(m_size);             \
+	m_name->set_font_data(DefaultFont);   \
 	MAKE_FALLBACKS(m_name);
 
 void editor_register_fonts(Ref<Theme> p_theme) {
 	/* Droid Sans */
 
-	Ref<DynamicFontData> DroidSans;
-	DroidSans.instance();
-	DroidSans->set_font_ptr(_font_DroidSans, _font_DroidSans_size);
-	DroidSans->set_force_autohinter(true); //just looks better..i think?
+	Ref<DynamicFontData> DefaultFont;
+	DefaultFont.instance();
+	DefaultFont->set_font_ptr(_font_NotoSansUI_Regular, _font_NotoSansUI_Regular_size);
+	DefaultFont->set_force_autohinter(true); //just looks better..i think?
 
-	Ref<DynamicFontData> DroidSansFallback;
-	DroidSansFallback.instance();
-	DroidSansFallback->set_font_ptr(_font_DroidSansFallback, _font_DroidSansFallback_size);
-	DroidSansFallback->set_force_autohinter(true); //just looks better..i think?
+	Ref<DynamicFontData> FontFallback;
+	FontFallback.instance();
+	FontFallback->set_font_ptr(_font_DroidSansFallback, _font_DroidSansFallback_size);
+	FontFallback->set_force_autohinter(true); //just looks better..i think?
 
-	Ref<DynamicFontData> DroidSansJapanese;
-	DroidSansJapanese.instance();
-	DroidSansJapanese->set_font_ptr(_font_DroidSansJapanese, _font_DroidSansJapanese_size);
-	DroidSansJapanese->set_force_autohinter(true); //just looks better..i think?
+	Ref<DynamicFontData> FontJapanese;
+	FontJapanese.instance();
+	FontJapanese->set_font_ptr(_font_DroidSansJapanese, _font_DroidSansJapanese_size);
+	FontJapanese->set_force_autohinter(true); //just looks better..i think?
 
-	Ref<DynamicFontData> DroidSansArabic;
-	DroidSansArabic.instance();
-	DroidSansArabic->set_font_ptr(_font_DroidSansArabic, _font_DroidSansArabic_size);
-	DroidSansArabic->set_force_autohinter(true); //just looks better..i think?
+	Ref<DynamicFontData> FontArabic;
+	FontArabic.instance();
+	FontArabic->set_font_ptr(_font_NotoNaskhArabicUI_Regular, _font_NotoNaskhArabicUI_Regular_size);
+	FontArabic->set_force_autohinter(true); //just looks better..i think?
 
-	Ref<DynamicFontData> DroidSansHebrew;
-	DroidSansHebrew.instance();
-	DroidSansHebrew->set_font_ptr(_font_DroidSansHebrew, _font_DroidSansHebrew_size);
-	DroidSansHebrew->set_force_autohinter(true); //just looks better..i think?
+	Ref<DynamicFontData> FontHebrew;
+	FontHebrew.instance();
+	FontHebrew->set_font_ptr(_font_NotoSansHebrew_Regular, _font_NotoSansHebrew_Regular_size);
+	FontHebrew->set_force_autohinter(true); //just looks better..i think?
 
-	Ref<DynamicFontData> DroidSansThai;
-	DroidSansThai.instance();
-	DroidSansThai->set_font_ptr(_font_DroidSansThai, _font_DroidSansThai_size);
-	DroidSansThai->set_force_autohinter(true); //just looks better..i think?
+	Ref<DynamicFontData> FontThai;
+	FontThai.instance();
+	FontThai->set_font_ptr(_font_NotoSansThaiUI_Regular, _font_NotoSansThaiUI_Regular_size);
+	FontThai->set_force_autohinter(true); //just looks better..i think?
 
 	/* Source Code Pro */
 
@@ -119,7 +119,7 @@ void editor_register_fonts(Ref<Theme> p_theme) {
 	dfmono->set_font_ptr(_font_source_code_pro, _font_source_code_pro_size);
 	//dfd->set_force_autohinter(true); //just looks better..i think?
 
-	MAKE_DROID_SANS(df, int(EditorSettings::get_singleton()->get("interface/font_size")) * EDSCALE);
+	MAKE_DEFAULT_FONT(df, int(EditorSettings::get_singleton()->get("interface/font_size")) * EDSCALE);
 
 	p_theme->set_default_theme_font(df);
 
@@ -127,9 +127,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_DROID_SANS(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", 18)) * EDSCALE);
 
-	MAKE_DROID_SANS(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", 16)) * EDSCALE);
 
 	p_theme->set_font("doc", "EditorFonts", df_doc);
 	p_theme->set_font("doc_title", "EditorFonts", df_title);