summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2016-05-30 19:41:32 -0300
committerJuan Linietsky <reduzio@gmail.com>2016-05-30 19:41:32 -0300
commit0eb6c644b282440d3e83aaa4db6db2c48be46f8c (patch)
tree0c3fd6ec3c13af50f3112e715a4875b183077f2b /tools
parentc7d24b7814b335fb9503f6a957ac5923a47da161 (diff)
changed font system to use fallbacks
this way more than 64k characters can be used
Diffstat (limited to 'tools')
-rw-r--r--tools/editor/editor_fonts.cpp68
-rw-r--r--tools/editor_fonts/DroidSans.ttfbin0 -> 190044 bytes
-rw-r--r--tools/editor_fonts/DroidSansArabic.ttfbin0 -> 35908 bytes
-rw-r--r--tools/editor_fonts/DroidSansFallback.ttfbin0 -> 3640264 bytes
-rw-r--r--tools/editor_fonts/DroidSansHebrew.ttfbin0 -> 23076 bytes
-rw-r--r--tools/editor_fonts/DroidSansJapanese.ttfbin0 -> 1173140 bytes
-rw-r--r--tools/editor_fonts/DroidSansThai.ttfbin0 -> 36028 bytes
-rw-r--r--tools/editor_fonts/droid_sans.ttfbin6314324 -> 0 bytes
8 files changed, 51 insertions, 17 deletions
diff --git a/tools/editor/editor_fonts.cpp b/tools/editor/editor_fonts.cpp
index e04dce294a..9bc24e6ca8 100644
--- a/tools/editor/editor_fonts.cpp
+++ b/tools/editor/editor_fonts.cpp
@@ -65,23 +65,62 @@ static Ref<BitmapFont> make_font(int p_height,int p_ascent, int p_valign, int p_
}
+
+#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);\
+ 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);
+
+
+
void editor_register_fonts(Ref<Theme> p_theme) {
- Ref<DynamicFontData> dfd;
- dfd.instance();
- dfd->set_font_ptr(_font_droid_sans,_font_droid_sans_size);
- dfd->set_force_autohinter(true); //just looks better..i think?
+ /* 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> DroidSansFallback;
+ DroidSansFallback.instance();
+ DroidSansFallback->set_font_ptr(_font_DroidSansFallback,_font_DroidSansFallback_size);
+ DroidSansFallback->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> DroidSansArabic;
+ DroidSansArabic.instance();
+ DroidSansArabic->set_font_ptr(_font_DroidSansArabic,_font_DroidSansArabic_size);
+ DroidSansArabic->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> DroidSansThai;
+ DroidSansThai.instance();
+ DroidSansThai->set_font_ptr(_font_DroidSansThai,_font_DroidSansThai_size);
+ DroidSansThai->set_force_autohinter(true); //just looks better..i think?
+
+ /* Source Code Pro */
Ref<DynamicFontData> dfmono;
dfmono.instance();
dfmono->set_font_ptr(_font_source_code_pro,_font_source_code_pro_size);
//dfd->set_force_autohinter(true); //just looks better..i think?
- Ref<DynamicFont> df;
- df.instance();
- df->set_size(int(EditorSettings::get_singleton()->get("global/font_size")));
- df->set_font_data(dfd);
-
+ MAKE_DROID_SANS(df,int(EditorSettings::get_singleton()->get("global/font_size")));
p_theme->set_default_theme_font(df);
@@ -89,15 +128,10 @@ 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"));
- Ref<DynamicFont> df_title;
- df_title.instance();
- df_title->set_size(int(EDITOR_DEF("help/help_title_font_size",18)));
- df_title->set_font_data(dfd);
+ MAKE_DROID_SANS(df_title,int(EDITOR_DEF("help/help_title_font_size",18)));
+
+ MAKE_DROID_SANS(df_doc,int(EDITOR_DEF("help/help_font_size",16)));
- Ref<DynamicFont> df_doc;
- df_doc.instance();
- df_doc->set_size(int(EDITOR_DEF("help/help_font_size",16)));
- df_doc->set_font_data(dfd);
p_theme->set_font("doc","EditorFonts",df_doc);
p_theme->set_font("doc_title","EditorFonts",df_title);
diff --git a/tools/editor_fonts/DroidSans.ttf b/tools/editor_fonts/DroidSans.ttf
new file mode 100644
index 0000000000..767c63ad00
--- /dev/null
+++ b/tools/editor_fonts/DroidSans.ttf
Binary files differ
diff --git a/tools/editor_fonts/DroidSansArabic.ttf b/tools/editor_fonts/DroidSansArabic.ttf
new file mode 100644
index 0000000000..660e2a9916
--- /dev/null
+++ b/tools/editor_fonts/DroidSansArabic.ttf
Binary files differ
diff --git a/tools/editor_fonts/DroidSansFallback.ttf b/tools/editor_fonts/DroidSansFallback.ttf
new file mode 100644
index 0000000000..206621fc6c
--- /dev/null
+++ b/tools/editor_fonts/DroidSansFallback.ttf
Binary files differ
diff --git a/tools/editor_fonts/DroidSansHebrew.ttf b/tools/editor_fonts/DroidSansHebrew.ttf
new file mode 100644
index 0000000000..8d77e3e4cf
--- /dev/null
+++ b/tools/editor_fonts/DroidSansHebrew.ttf
Binary files differ
diff --git a/tools/editor_fonts/DroidSansJapanese.ttf b/tools/editor_fonts/DroidSansJapanese.ttf
new file mode 100644
index 0000000000..412fa3de05
--- /dev/null
+++ b/tools/editor_fonts/DroidSansJapanese.ttf
Binary files differ
diff --git a/tools/editor_fonts/DroidSansThai.ttf b/tools/editor_fonts/DroidSansThai.ttf
new file mode 100644
index 0000000000..f849baeff9
--- /dev/null
+++ b/tools/editor_fonts/DroidSansThai.ttf
Binary files differ
diff --git a/tools/editor_fonts/droid_sans.ttf b/tools/editor_fonts/droid_sans.ttf
deleted file mode 100644
index a117feac85..0000000000
--- a/tools/editor_fonts/droid_sans.ttf
+++ /dev/null
Binary files differ