- colors: add COL_FRAME wrapper

This commit is contained in:
svenhoefer
2016-10-10 14:19:54 +02:00
parent c4827704ac
commit 75fe6e407d
33 changed files with 64 additions and 59 deletions

View File

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

View File

@@ -74,7 +74,7 @@ int CLuaInstCCHeader::CCHeaderNew(lua_State *L)
lua_Integer shadow_mode = CC_SHADOW_OFF;
std::string caption, icon;
lua_Unsigned color_frame = (lua_Unsigned)COL_MENUCONTENT_PLUS_6;
lua_Unsigned color_frame = (lua_Unsigned)COL_FRAME_PLUS_0;
lua_Unsigned color_body = (lua_Unsigned)COL_MENUCONTENT_PLUS_0;
lua_Unsigned color_shadow = (lua_Unsigned)COL_SHADOW_PLUS_0;

View File

@@ -78,7 +78,7 @@ int CLuaInstCCPicture::CCPictureNew(lua_State *L)
lua_Integer x=10, y=10, dx=100, dy=100;
std::string image_name = "";
lua_Integer alignment = 0;
lua_Unsigned color_frame = (lua_Unsigned)COL_MENUCONTENT_PLUS_6;
lua_Unsigned color_frame = (lua_Unsigned)COL_FRAME_PLUS_0;
lua_Unsigned color_background = (lua_Unsigned)COL_MENUCONTENT_PLUS_0;
lua_Unsigned color_shadow = (lua_Unsigned)COL_SHADOW_PLUS_0;

View File

@@ -83,7 +83,7 @@ int CLuaInstCCText::CCTextNew(lua_State *L)
lua_Integer mode = CTextBox::AUTO_WIDTH;
lua_Integer font_text = SNeutrinoSettings::FONT_TYPE_MENU;
lua_Unsigned color_text = (lua_Unsigned)COL_MENUCONTENT_TEXT;
lua_Unsigned color_frame = (lua_Unsigned)COL_MENUCONTENT_PLUS_6;
lua_Unsigned color_frame = (lua_Unsigned)COL_FRAME_PLUS_0;
lua_Unsigned color_body = (lua_Unsigned)COL_MENUCONTENT_PLUS_0;
lua_Unsigned color_shadow = (lua_Unsigned)COL_SHADOW_PLUS_0;

View File

@@ -73,7 +73,7 @@ int CLuaInstCCWindow::CCWindowNew(lua_State *L)
lua_assert(lua_istable(L,1));
std::string name, icon = std::string(NEUTRINO_ICON_INFO);
lua_Unsigned color_frame = (lua_Unsigned)COL_MENUCONTENT_PLUS_6;
lua_Unsigned color_frame = (lua_Unsigned)COL_FRAME_PLUS_0;
lua_Unsigned color_body = (lua_Unsigned)COL_MENUCONTENT_PLUS_0;
lua_Unsigned color_shadow = (lua_Unsigned)COL_SHADOW_PLUS_0;
std::string tmp1 = "false";

View File

@@ -171,6 +171,7 @@ static void set_lua_variables(lua_State *L)
{ "MENUCONTENTSELECTED", MAGIC_COLOR | (COL_MENUCONTENTSELECTED) },
{ "MENUCONTENTINACTIVE", MAGIC_COLOR | (COL_MENUCONTENTINACTIVE) },
{ "MENUFOOT", MAGIC_COLOR | (COL_MENUFOOT) },
{ "FRAME", MAGIC_COLOR | (COL_FRAME) },
{ "BACKGROUND", MAGIC_COLOR | (COL_BACKGROUND) },
{ "DARK_RED", MAGIC_COLOR | (COL_DARK_RED0) },
{ "DARK_GREEN", MAGIC_COLOR | (COL_DARK_GREEN0) },
@@ -217,6 +218,7 @@ static void set_lua_variables(lua_State *L)
{ "MENUCONTENTSELECTED_PLUS_2", (lua_Unsigned) (COL_MENUCONTENTSELECTED_PLUS_2) },
{ "MENUCONTENTINACTIVE_PLUS_0", (lua_Unsigned) (COL_MENUCONTENTINACTIVE_PLUS_0) },
{ "MENUFOOT_PLUS_0", (lua_Unsigned) (COL_MENUFOOT_PLUS_0) },
{ "FRAME_PLUS_0", (lua_Unsigned) (COL_FRAME_PLUS_0) },
{ NULL, 0 }
};