Add a second font, flesh out browser screen

This commit is contained in:
jacqueline
2023-11-23 10:40:04 +11:00
parent 9eb5ae6e94
commit b07bfbc6c7
49 changed files with 56220 additions and 102 deletions
+3 -33
View File
@@ -240,7 +240,7 @@ static int luavgl_font_create(lua_State *L)
{
int weight;
int size;
char *str, *name;
const char *name;
const lv_font_t *font = NULL;
if (!lua_isstring(L, 1)) {
@@ -271,39 +271,9 @@ static int luavgl_font_create(lua_State *L)
weight = FONT_WEIGHT_NORMAL;
}
str = strdup(lua_tostring(L, 1));
if (str == NULL) {
return luaL_error(L, "no memory.");
}
name = lua_tostring(L, 1);
font = _luavgl_font_create(L, name, size, weight);
name = to_lower(str);
while (*name) {
if (*name == ' ') {
name++;
continue;
}
char *end = strchr(name, ',');
if (end != NULL) {
*end = '\0';
} else {
end = name + strlen(name);
}
char *trim = end - 1;
while (*trim == ' ') {
*trim-- = '\0'; /* trailing space. */
}
font = _luavgl_font_create(L, name, size, weight);
if (font) {
break;
}
name = end + 1; /* next */
}
free(str);
if (font) {
lua_pushlightuserdata(L, (void *)font);
return 1;
+1 -1
View File
@@ -14,7 +14,7 @@ extern "C" {
typedef const lv_font_t *(*make_font_cb)(const char *name, int size,
int weight);
typedef void (*delete_font_cb)(const lv_font_t *);
typedef void (*delete_font_cb)(lv_font_t *);
typedef int (*luavgl_pcall_t)(lua_State *L, int nargs, int nresults);
typedef struct {