mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0074876592
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:34:24 +01:00
parent 55c039615f 352c9011f9
commit 2199baaa25
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -270,6 +270,7 @@ static void set_lua_variables(lua_State *L)
{ "RADIUS_MID", RADIUS_MID }, { "RADIUS_MID", RADIUS_MID },
{ "RADIUS_SMALL", RADIUS_SMALL }, { "RADIUS_SMALL", RADIUS_SMALL },
{ "RADIUS_MIN", RADIUS_MIN }, { "RADIUS_MIN", RADIUS_MIN },
{ "RADIUS_NONE", RADIUS_NONE },
{ NULL, 0 } { NULL, 0 }
}; };
@@ -343,7 +344,8 @@ static void set_lua_variables(lua_State *L)
{ "STYLE_ITALIC", (lua_Integer)CNeutrinoFonts::FONT_STYLE_ITALIC }, { "STYLE_ITALIC", (lua_Integer)CNeutrinoFonts::FONT_STYLE_ITALIC },
{ "MAX", (lua_Integer)CNeutrinoFonts::DYNFONTEXT_MAX }, { "MAX", (lua_Integer)CNeutrinoFonts::DYNFONTEXT_MAX },
{ "MAXIMUM_FONTS", (lua_Integer)CLuaInstance::DYNFONT_MAXIMUM_FONTS }, { "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 }, { "TOO_HIGH", (lua_Integer)CLuaInstance::DYNFONT_TOO_HIGH },
{ NULL, 0 } { NULL, 0 }
}; };
@@ -1050,7 +1052,7 @@ int CLuaInstance::getDynFont(lua_State *L)
dx = luaL_checkint(L, 2); dx = luaL_checkint(L, 2);
if (dx > (lua_Integer)CFrameBuffer::getInstance()->getScreenWidth(true)) { if (dx > (lua_Integer)CFrameBuffer::getInstance()->getScreenWidth(true)) {
lua_pushnil(L); lua_pushnil(L);
lua_pushinteger(L, DYNFONT_TO_WIDE); lua_pushinteger(L, DYNFONT_TOO_WIDE);
return 2; return 2;
} }
dy = luaL_checkint(L, 3); dy = luaL_checkint(L, 3);

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

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