diff options
| author | Michael Pavone <pavone@retrodev.com> | 2018-03-06 21:27:12 -0800 |
|---|---|---|
| committer | Michael Pavone <pavone@retrodev.com> | 2018-03-06 21:27:12 -0800 |
| commit | d738c30dec8a7c9f351094851c00a4623f339084 (patch) | |
| tree | d74219313a54b16466a53f4be180093cd5775a02 /nuklear_ui/blastem_nuklear.c | |
| parent | 94b11b186fa4cf46c64bc3fad55f74c7b5096ffe (diff) | |
Added support for TTC and dfont format true type fonts. More robust font selection on Windows
--HG--
branch : nuklear_ui
Diffstat (limited to 'nuklear_ui/blastem_nuklear.c')
| -rw-r--r-- | nuklear_ui/blastem_nuklear.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/nuklear_ui/blastem_nuklear.c b/nuklear_ui/blastem_nuklear.c index 715eb9f..59d5a3b 100644 --- a/nuklear_ui/blastem_nuklear.c +++ b/nuklear_ui/blastem_nuklear.c @@ -902,11 +902,12 @@ static void context_created(void) nk_sdl_device_create(); struct nk_font_atlas *atlas; nk_sdl_font_stash_begin(&atlas); - char *font = default_font_path(); + uint32_t font_size; + uint8_t *font = default_font(&font_size); if (!font) { fatal_error("Failed to find default font path\n"); } - struct nk_font *def_font = nk_font_atlas_add_from_file(atlas, font, 30, NULL); + struct nk_font *def_font = nk_font_atlas_add_from_memory(atlas, font, font_size, 30, NULL); nk_sdl_font_stash_end(); nk_style_set_font(context, &def_font->handle); } @@ -944,11 +945,14 @@ void blastem_nuklear_init(uint8_t file_loaded) struct nk_font_atlas *atlas; nk_sdl_font_stash_begin(&atlas); - char *font = default_font_path(); + //char *font = default_font_path(); + uint32_t font_size; + uint8_t *font = default_font(&font_size); if (!font) { fatal_error("Failed to find default font path\n"); } - struct nk_font *def_font = nk_font_atlas_add_from_file(atlas, font, 30, NULL); + //struct nk_font *def_font = nk_font_atlas_add_from_file(atlas, font, 30, NULL); + struct nk_font *def_font = nk_font_atlas_add_from_memory(atlas, font, font_size, 30, NULL); nk_sdl_font_stash_end(); nk_style_set_font(context, &def_font->handle); current_view = file_loaded ? view_play : view_menu; |