diff 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
line wrap: on
line diff
--- a/libmlk-ui/mlk/ui/theme.c	Sat Feb 18 13:37:11 2023 +0100
+++ b/libmlk-ui/mlk/ui/theme.c	Sat Feb 18 20:40:01 2023 +0100
@@ -63,8 +63,8 @@
 	const unsigned char *data;
 	const size_t datasz;
 	unsigned int size;
-	struct font **dest;
-	struct font font;
+	struct mlk_font **dest;
+	struct mlk_font font;
 } default_fonts[] = {
 	FONT(assets_fonts_opensans_light, 12, THEME_FONT_DEBUG),
 	FONT(assets_fonts_opensans_regular, 14, THEME_FONT_INTERFACE),
@@ -78,7 +78,7 @@
 	for (size_t i = 0; i < UTIL_SIZE(default_fonts); ++i) {
 		struct font_catalog *fc = &default_fonts[i];
 
-		if (font_openmem(&fc->font, fc->data, fc->datasz, fc->size) < 0)
+		if (mlk_font_openmem(&fc->font, fc->data, fc->datasz, fc->size) < 0)
 			goto failed;
 
 		/* Reference this font into the catalog. */
@@ -149,7 +149,7 @@
 theme_finish(void)
 {
 	for (size_t i = 0; i < UTIL_SIZE(default_fonts); ++i) {
-		font_finish(&default_fonts[i].font);
+		mlk_font_finish(&default_fonts[i].font);
 		*default_fonts[i].dest = NULL;
 	}
 }