Merge pull request #821 from lakkatv/lakka

(Lakka) theme font and theme switching
This commit is contained in:
Twinaphex 2014-07-19 05:20:17 +02:00
commit df005ba50a
2 changed files with 8 additions and 4 deletions

View File

@ -55,6 +55,7 @@ float global_alpha = 0;
// Font variables // Font variables
void *font; void *font;
const gl_font_renderer_t *font_driver; const gl_font_renderer_t *font_driver;
char font_path[PATH_MAX];
enum enum
{ {
@ -781,11 +782,13 @@ static void lakka_context_reset(void *data)
if (!menu) if (!menu)
return; 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, "lakka", sizeof(dirpath)); fill_pathname_join(dirpath, g_settings.assets_directory, "lakka", sizeof(dirpath));
fill_pathname_join(dirpath, g_settings.assets_directory, THEME, sizeof(dirpath));
fill_pathname_slash(dirpath, 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_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)); fill_pathname_join(textures[TEXTURE_SETTINGS].path, dirpath, "settings.png", sizeof(textures[TEXTURE_SETTINGS].path));
@ -811,7 +814,7 @@ static void lakka_context_reset(void *data)
core_info_t *info; core_info_t *info;
core_info_list_t *info_list; core_info_list_t *info_list;
fill_pathname_join(dirpath, g_settings.assets_directory, "lakka", sizeof(dirpath)); fill_pathname_join(dirpath, g_settings.assets_directory, THEME, sizeof(dirpath));
fill_pathname_slash(dirpath, sizeof(dirpath)); fill_pathname_slash(dirpath, sizeof(dirpath));
info_list = (core_info_list_t*)menu->core_info; info_list = (core_info_list_t*)menu->core_info;

View File

@ -21,6 +21,7 @@
#include "../../../gfx/gl_common.h" #include "../../../gfx/gl_common.h"
#include "../../../gfx/fonts/fonts.h" #include "../../../gfx/fonts/fonts.h"
#define THEME "flatui" // flatui or monochrome themes are available
#define DELAY 0.02 #define DELAY 0.02
#define HSPACING 300 #define HSPACING 300
#define VSPACING 75 #define VSPACING 75