diff --git a/src/gui/lua/lua_api_version.h b/src/gui/lua/lua_api_version.h index 54fa105fa..6c8b8bc22 100644 --- a/src/gui/lua/lua_api_version.h +++ b/src/gui/lua/lua_api_version.h @@ -4,4 +4,4 @@ * to luainstance.h changes */ #define LUA_API_VERSION_MAJOR 1 -#define LUA_API_VERSION_MINOR 68 +#define LUA_API_VERSION_MINOR 69 diff --git a/src/gui/lua/luainstance.cpp b/src/gui/lua/luainstance.cpp index cc31a00ff..067b2c7bc 100644 --- a/src/gui/lua/luainstance.cpp +++ b/src/gui/lua/luainstance.cpp @@ -568,6 +568,7 @@ void LuaInstRegisterFunctions(lua_State *L, bool fromThreads/*=false*/) { "saveScreen", CLuaInstance::saveScreen }, { "restoreScreen", CLuaInstance::restoreScreen }, { "deleteSavedScreen", CLuaInstance::deleteSavedScreen }, + { "scale2Res", CLuaInstance::scale2Res }, /* lua_misc.cpp @@ -1183,4 +1184,22 @@ int CLuaInstance::deleteSavedScreen(lua_State *L) return 0; } +int CLuaInstance::scale2Res(lua_State *L) +{ + CLuaData *W = CheckData(L, 1); + if (!W || !W->fbwin) return 0; + + int value, ret; + value = luaL_checkint(L, 2); + +/* Remove this when pu/fb-setmode branch is merged to master */ +#ifdef SCALE2RES_DEFINED + ret = CFrameBuffer::getInstance()->scale2Res(value); +#else + ret = value; +#endif + lua_pushinteger(L, ret); + return 1; +} + /* --------------------------------------------------------------- */ diff --git a/src/gui/lua/luainstance.h b/src/gui/lua/luainstance.h index 69311a9b9..21ebb625b 100644 --- a/src/gui/lua/luainstance.h +++ b/src/gui/lua/luainstance.h @@ -73,6 +73,7 @@ public: static int saveScreen(lua_State *L); static int restoreScreen(lua_State *L); static int deleteSavedScreen(lua_State *L); + static int scale2Res(lua_State *L); private: lua_State* lua;