Mercurial > molko
comparison libmlk-ui/mlk/ui/theme.c @ 451:90a097b1aa0f
core: font -> mlk_font
author | David Demelier <markand@malikania.fr> |
---|---|
date | Sat, 18 Feb 2023 20:40:01 +0100 |
parents | e1fa1b867281 |
children | ca30ff96bbe0 |
comparison
equal
deleted
inserted
replaced
450:b26dd49f69ff | 451:90a097b1aa0f |
---|---|
61 | 61 |
62 static struct font_catalog { | 62 static struct font_catalog { |
63 const unsigned char *data; | 63 const unsigned char *data; |
64 const size_t datasz; | 64 const size_t datasz; |
65 unsigned int size; | 65 unsigned int size; |
66 struct font **dest; | 66 struct mlk_font **dest; |
67 struct font font; | 67 struct mlk_font font; |
68 } default_fonts[] = { | 68 } default_fonts[] = { |
69 FONT(assets_fonts_opensans_light, 12, THEME_FONT_DEBUG), | 69 FONT(assets_fonts_opensans_light, 12, THEME_FONT_DEBUG), |
70 FONT(assets_fonts_opensans_regular, 14, THEME_FONT_INTERFACE), | 70 FONT(assets_fonts_opensans_regular, 14, THEME_FONT_INTERFACE), |
71 FONT(assets_fonts_opensans_medium, 14, THEME_FONT_IMPORTANT) | 71 FONT(assets_fonts_opensans_medium, 14, THEME_FONT_IMPORTANT) |
72 }; | 72 }; |
76 { | 76 { |
77 /* Open all fonts. */ | 77 /* Open all fonts. */ |
78 for (size_t i = 0; i < UTIL_SIZE(default_fonts); ++i) { | 78 for (size_t i = 0; i < UTIL_SIZE(default_fonts); ++i) { |
79 struct font_catalog *fc = &default_fonts[i]; | 79 struct font_catalog *fc = &default_fonts[i]; |
80 | 80 |
81 if (font_openmem(&fc->font, fc->data, fc->datasz, fc->size) < 0) | 81 if (mlk_font_openmem(&fc->font, fc->data, fc->datasz, fc->size) < 0) |
82 goto failed; | 82 goto failed; |
83 | 83 |
84 /* Reference this font into the catalog. */ | 84 /* Reference this font into the catalog. */ |
85 *default_fonts[i].dest = &default_fonts[i].font; | 85 *default_fonts[i].dest = &default_fonts[i].font; |
86 } | 86 } |
147 | 147 |
148 void | 148 void |
149 theme_finish(void) | 149 theme_finish(void) |
150 { | 150 { |
151 for (size_t i = 0; i < UTIL_SIZE(default_fonts); ++i) { | 151 for (size_t i = 0; i < UTIL_SIZE(default_fonts); ++i) { |
152 font_finish(&default_fonts[i].font); | 152 mlk_font_finish(&default_fonts[i].font); |
153 *default_fonts[i].dest = NULL; | 153 *default_fonts[i].dest = NULL; |
154 } | 154 } |
155 } | 155 } |