walkero
/
lite-xl
1
0
Fork 0
Code Issues 7 Pull Requests Projects Releases 14 Wiki Activity

Fixed minor issue.

This commit is contained in:
Adam Harrison 2021-10-16 23:32:17 -04:00
parent f2488fdd8d
commit 7575d2eee6
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/api/renderer.c
View File

@ -56,28 +56,24 @@ static int f_font_load(lua_State *L) {
} }
static bool font_retrieve(lua_State* L, RenFont** fonts, int idx) { static bool font_retrieve(lua_State* L, RenFont** fonts, int idx) {
memset(fonts, 0, sizeof(fonts)*FONT_FALLBACK_MAX); memset(fonts, 0, sizeof(RenFont*)*FONT_FALLBACK_MAX);
if (lua_type(L, 1) == LUA_TTABLE) { if (lua_type(L, 1) != LUA_TTABLE) {
for (int i = 0; i < FONT_FALLBACK_MAX; ++i) { fonts[0] = *(RenFont**)luaL_checkudata(L, idx, API_TYPE_FONT);
lua_rawgeti(L, 1, i+1);
bool nil = lua_isnil(L, -1);
if (!nil)
fonts[i] = *(RenFont**)luaL_checkudata(L, -1, API_TYPE_FONT);
lua_pop(L, 1);
if (nil)
break;
}
return true;
} else {
fonts[0] = *(RenFont**)luaL_checkudata(L, 1, API_TYPE_FONT);
return false; return false;
} }
int i = 0;
do {
lua_rawgeti(L, idx, i+1);
fonts[i] = !lua_isnil(L, -1) ? *(RenFont**)luaL_checkudata(L, -1, API_TYPE_FONT) : NULL;
lua_pop(L, 1);
} while (fonts[i] && i++ < FONT_FALLBACK_MAX);
return true;
} }
static int f_font_copy(lua_State *L) { static int f_font_copy(lua_State *L) {
RenFont* fonts[FONT_FALLBACK_MAX]; RenFont* fonts[FONT_FALLBACK_MAX];
float size = lua_gettop(L) >= 2 ? luaL_checknumber(L, 2) : ren_font_group_get_height(fonts);
bool table = font_retrieve(L, fonts, 1); bool table = font_retrieve(L, fonts, 1);
float size = lua_gettop(L) >= 2 ? luaL_checknumber(L, 2) : ren_font_group_get_height(fonts);
if (table) { if (table) {
lua_newtable(L); lua_newtable(L);
luaL_setmetatable(L, API_TYPE_FONT); luaL_setmetatable(L, API_TYPE_FONT);