len0rd/love-nuklear
1
0
Fork 0
mirror of https://github.com/keharriso/love-nuklear.git synced 2025-09-10 16:17:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow ui:style* outside of frameBegin/frameEnd

Browse source
This commit is contained in:
Kevin Harrison 2019-01-03 12:40:11 -05:00
parent 3254a42992
commit de05b2595c
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/nuklear_love.c
View file

@ -3910,6 +3910,9 @@ static int nk_love_style_push(lua_State *L)
struct nk_love_context *ctx = nk_love_checkcontext(1); struct nk_love_context *ctx = nk_love_checkcontext(1);
if (!lua_istable(L, 2)) if (!lua_istable(L, 2))
luaL_typerror(L, 2, "table"); luaL_typerror(L, 2, "table");
int outOfContext = (context == NULL);
if (outOfContext)
context = ctx;
lua_newtable(L); lua_newtable(L);
lua_insert(L, 2); lua_insert(L, 2);
NK_LOVE_STYLE_PUSH("font", font, &ctx->nkctx.style.font); NK_LOVE_STYLE_PUSH("font", font, &ctx->nkctx.style.font);
@ -3938,6 +3941,8 @@ static int nk_love_style_push(lua_State *L)
size_t stack_size = lua_objlen(L, -1); size_t stack_size = lua_objlen(L, -1);
lua_pushvalue(L, 2); lua_pushvalue(L, 2);
lua_rawseti(L, -2, stack_size + 1); lua_rawseti(L, -2, stack_size + 1);
if (outOfContext)
context = NULL;
return 0; return 0;
} }
@ -3945,6 +3950,9 @@ static int nk_love_style_pop(lua_State *L)
{ {
nk_love_assert_argc(lua_gettop(L) == 1); nk_love_assert_argc(lua_gettop(L) == 1);
struct nk_love_context *ctx = nk_love_checkcontext(1); struct nk_love_context *ctx = nk_love_checkcontext(1);
int outOfContext = (context == NULL);
if (outOfContext)
context = ctx;
lua_getfield(L, LUA_REGISTRYINDEX, "nuklear"); lua_getfield(L, LUA_REGISTRYINDEX, "nuklear");
lua_pushlightuserdata(L, ctx); lua_pushlightuserdata(L, ctx);
lua_gettable(L, -2); lua_gettable(L, -2);
@ -3976,6 +3984,8 @@ static int nk_love_style_pop(lua_State *L)
} }
lua_pop(L, 1); lua_pop(L, 1);
} }
if (outOfContext)
context = NULL;
return 0; return 0;
} }