mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-03 02:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6673ffd4ea
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-03 10:38:14 +01:00
parent 0e588328e0 7d68b0c284
commit 3d3e8163b8
18 changed files with 160 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/lua/lua_api_version.h
View File

@@ -4,4 +4,4 @@
* to luainstance.h changes
*/
#define LUA_API_VERSION_MAJOR 1
#define LUA_API_VERSION_MINOR 69
#define LUA_API_VERSION_MINOR 70

20
src/gui/lua/luainstance.cpp
View File

@@ -270,6 +270,20 @@ static void set_lua_variables(lua_State *L)
{ "RADIUS_MID", RADIUS_MID },
{ "RADIUS_SMALL", RADIUS_SMALL },
{ "RADIUS_MIN", RADIUS_MIN },
{ "RADIUS_NONE", RADIUS_NONE },
{ NULL, 0 }
};
/* offsets, exported as e.g. OFFSET['SHADOW'] */
table_key offsets[] =
{
{ "SHADOW", OFFSET_SHADOW },
{ "INTER", OFFSET_INTER },
{ "INNER_LARGE", OFFSET_INNER_LARGE },
{ "INNER_MID", OFFSET_INNER_MID },
{ "INNER_SMALL", OFFSET_INNER_SMALL },
{ "INNER_MIN", OFFSET_INNER_MIN },
{ "INNER_NONE", OFFSET_INNER_NONE },
{ NULL, 0 }
};
@@ -330,7 +344,8 @@ static void set_lua_variables(lua_State *L)
{ "STYLE_ITALIC", (lua_Integer)CNeutrinoFonts::FONT_STYLE_ITALIC },
{ "MAX", (lua_Integer)CNeutrinoFonts::DYNFONTEXT_MAX },
{ "MAXIMUM_FONTS", (lua_Integer)CLuaInstance::DYNFONT_MAXIMUM_FONTS },
{ "TO_WIDE", (lua_Integer)CLuaInstance::DYNFONT_TO_WIDE },
{ "TO_WIDE", (lua_Integer)CLuaInstance::DYNFONT_TOO_WIDE }, // just here to stay backward compatible
{ "TOO_WIDE", (lua_Integer)CLuaInstance::DYNFONT_TOO_WIDE },
{ "TOO_HIGH", (lua_Integer)CLuaInstance::DYNFONT_TOO_HIGH },
{ NULL, 0 }
};
@@ -375,6 +390,7 @@ static void set_lua_variables(lua_State *L)
{ "SCREEN", screenopts },
{ "FONT", fontlist },
{ "CORNER", corners },
{ "OFFSET", offsets },
{ "MENU_RETURN", menureturn },
{ "APIVERSION", apiversion },
{ "PLAYSTATE", playstate },
@@ -1036,7 +1052,7 @@ int CLuaInstance::getDynFont(lua_State *L)
dx = luaL_checkint(L, 2);
if (dx > (lua_Integer)CFrameBuffer::getInstance()->getScreenWidth(true)) {
lua_pushnil(L);
lua_pushinteger(L, DYNFONT_TO_WIDE);
lua_pushinteger(L, DYNFONT_TOO_WIDE);
return 2;
}
dy = luaL_checkint(L, 3);

2
src/gui/lua/luainstance.h
View File

@@ -46,7 +46,7 @@ public:
enum {
DYNFONT_NO_ERROR = 0,
DYNFONT_MAXIMUM_FONTS = 1,
DYNFONT_TO_WIDE = 2,
DYNFONT_TOO_WIDE = 2,
DYNFONT_TOO_HIGH = 3
};