From d46bd44a7c9b2cff879cc9fe017320364846e9f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= Date: Fri, 18 Jul 2014 06:57:24 +0200 Subject: [PATCH] (Lakka) Use theme font --- frontend/menu/disp/lakka.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/frontend/menu/disp/lakka.c b/frontend/menu/disp/lakka.c index f52b64c70a..93fafc19b1 100644 --- a/frontend/menu/disp/lakka.c +++ b/frontend/menu/disp/lakka.c @@ -55,6 +55,7 @@ float global_alpha = 0; // Font variables void *font; const gl_font_renderer_t *font_driver; +char font_path[PATH_MAX]; enum { @@ -781,11 +782,12 @@ static void lakka_context_reset(void *data) if (!menu) return; - gl_font_init_first(&font_driver, &font, gl, - *g_settings.video.font_path ? g_settings.video.font_path : NULL, g_settings.video.font_size); - fill_pathname_join(dirpath, g_settings.assets_directory, THEME, sizeof(dirpath)); fill_pathname_slash(dirpath, sizeof(dirpath)); + + fill_pathname_join(font_path, dirpath, "font.ttf", sizeof(font_path)); + + gl_font_init_first(&font_driver, &font, gl, font_path, 32); fill_pathname_join(textures[TEXTURE_BG].path, dirpath, "bg.png", sizeof(textures[TEXTURE_BG].path)); fill_pathname_join(textures[TEXTURE_SETTINGS].path, dirpath, "settings.png", sizeof(textures[TEXTURE_SETTINGS].path));