diff --git a/editor/editor_fonts.cpp b/editor/editor_fonts.cpp index 8bc7647849..cc054dc40e 100644 --- a/editor/editor_fonts.cpp +++ b/editor/editor_fonts.cpp @@ -64,12 +64,12 @@ static Ref 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_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 m_name; \ @@ -86,30 +86,30 @@ void editor_register_fonts(Ref p_theme) { DefaultFont->set_font_ptr(_font_NotoSansUI_Regular, _font_NotoSansUI_Regular_size); DefaultFont->set_force_autohinter(true); //just looks better..i think? - Ref DroidSansFallback; - DroidSansFallback.instance(); - DroidSansFallback->set_font_ptr(_font_DroidSansFallback, _font_DroidSansFallback_size); - DroidSansFallback->set_force_autohinter(true); //just looks better..i think? + Ref FontFallback; + FontFallback.instance(); + FontFallback->set_font_ptr(_font_DroidSansFallback, _font_DroidSansFallback_size); + FontFallback->set_force_autohinter(true); //just looks better..i think? - Ref DroidSansJapanese; - DroidSansJapanese.instance(); - DroidSansJapanese->set_font_ptr(_font_DroidSansJapanese, _font_DroidSansJapanese_size); - DroidSansJapanese->set_force_autohinter(true); //just looks better..i think? + Ref FontJapanese; + FontJapanese.instance(); + FontJapanese->set_font_ptr(_font_DroidSansJapanese, _font_DroidSansJapanese_size); + FontJapanese->set_force_autohinter(true); //just looks better..i think? - Ref DroidSansArabic; - DroidSansArabic.instance(); - DroidSansArabic->set_font_ptr(_font_DroidSansArabic, _font_DroidSansArabic_size); - DroidSansArabic->set_force_autohinter(true); //just looks better..i think? + Ref 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 DroidSansHebrew; - DroidSansHebrew.instance(); - DroidSansHebrew->set_font_ptr(_font_DroidSansHebrew, _font_DroidSansHebrew_size); - DroidSansHebrew->set_force_autohinter(true); //just looks better..i think? + Ref 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 DroidSansThai; - DroidSansThai.instance(); - DroidSansThai->set_font_ptr(_font_DroidSansThai, _font_DroidSansThai_size); - DroidSansThai->set_force_autohinter(true); //just looks better..i think? + Ref 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 */ diff --git a/thirdparty/README.md b/thirdparty/README.md index d33da39445..bfd5606ca5 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -17,15 +17,13 @@ TODO. ## fonts -### Noto Sans UI Regular +### Noto Sans - Upstream: https://github.com/googlei18n/noto-fonts - Version: 1.06 - License: OFL-1.1 -#### What’s the difference between the UI and non-UI versions? -The UI fonts were initially prepared for use in Android’s UI. They have tighter vertical metrics, and some glyphs that would be clipped are redrawn to fit within the constrained space. They can be used anywhere that has limited vertical space. There are no UI verions of scripts that do not need such adjustment, and the non-UI versions should be preferred for use in body text. -https://github.com/googlei18n/noto-fonts/blob/master/FAQ.md#whats-the-difference-between-the-ui-and-non-ui-versions +Use UI font if exists, because it has tight vertial metrix and good for UI. ### Adobe Source Code Pro Regular diff --git a/thirdparty/fonts/DroidSansArabic.ttf b/thirdparty/fonts/DroidSansArabic.ttf deleted file mode 100644 index 660e2a9916..0000000000 Binary files a/thirdparty/fonts/DroidSansArabic.ttf and /dev/null differ diff --git a/thirdparty/fonts/DroidSansHebrew.ttf b/thirdparty/fonts/DroidSansHebrew.ttf deleted file mode 100644 index 8d77e3e4cf..0000000000 Binary files a/thirdparty/fonts/DroidSansHebrew.ttf and /dev/null differ diff --git a/thirdparty/fonts/NotoNaskhArabicUI_Regular.ttf b/thirdparty/fonts/NotoNaskhArabicUI_Regular.ttf new file mode 100644 index 0000000000..67713c697e Binary files /dev/null and b/thirdparty/fonts/NotoNaskhArabicUI_Regular.ttf differ diff --git a/thirdparty/fonts/NotoSansHebrew_Regular.ttf b/thirdparty/fonts/NotoSansHebrew_Regular.ttf new file mode 100644 index 0000000000..5027f5c228 Binary files /dev/null and b/thirdparty/fonts/NotoSansHebrew_Regular.ttf differ diff --git a/thirdparty/fonts/DroidSansThai.ttf b/thirdparty/fonts/NotoSansThaiUI_Regular.ttf similarity index 64% rename from thirdparty/fonts/DroidSansThai.ttf rename to thirdparty/fonts/NotoSansThaiUI_Regular.ttf index f849baeff9..9c50a1b8f5 100644 Binary files a/thirdparty/fonts/DroidSansThai.ttf and b/thirdparty/fonts/NotoSansThaiUI_Regular.ttf differ