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

CLuaInstance: Add has_shadow and window colors to cwindow.new

Browse Source 
Origin commit data
------------------
Commit: 8d1e6b1e00
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-02-27 (Thu, 27 Feb 2014)
This commit is contained in:
Michael Liebmann
2014-02-27 22:46:33 +01:00
parent f601b078af
commit 9e820bc45f
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gui/luainstance.cpp
View File

@@ -1308,11 +1308,15 @@ int CLuaInstance::CWindowNew(lua_State *L)
{ {
lua_assert(lua_istable(L,1)); lua_assert(lua_istable(L,1));
std::string name, icon = std::string(NEUTRINO_ICON_INFO); std::string name, icon = std::string(NEUTRINO_ICON_INFO);
std::string btnRed = ""; lua_Integer color_frame = (lua_Integer)COL_MENUCONTENT_PLUS_6;
std::string btnGreen = ""; lua_Integer color_body = (lua_Integer)COL_MENUCONTENT_PLUS_0;
std::string btnYellow = ""; lua_Integer color_shadow = (lua_Integer)COL_MENUCONTENTDARK_PLUS_0;
std::string btnBlue = ""; std::string tmp1 = "false";
std::string btnRed = "";
std::string btnGreen = "";
std::string btnYellow = "";
std::string btnBlue = "";
int x = 100, y = 100, dx = 450, dy = 250; int x = 100, y = 100, dx = 450, dy = 250;
tableLookup(L, "x", x); tableLookup(L, "x", x);
tableLookup(L, "y", y); tableLookup(L, "y", y);
@@ -1320,6 +1324,11 @@ int CLuaInstance::CWindowNew(lua_State *L)
tableLookup(L, "dy", dy); tableLookup(L, "dy", dy);
tableLookup(L, "name", name) || tableLookup(L, "title", name) || tableLookup(L, "caption", name); tableLookup(L, "name", name) || tableLookup(L, "title", name) || tableLookup(L, "caption", name);
tableLookup(L, "icon", icon); tableLookup(L, "icon", icon);
tableLookup(L, "has_shadow" , tmp1);
bool has_shadow = (tmp1 == "true" || tmp1 == "1" || tmp1 == "yes");
tableLookup(L, "color_frame" , color_frame);
tableLookup(L, "color_body" , color_body);
tableLookup(L, "color_shadow", color_shadow);
tableLookup(L, "btnRed", btnRed); tableLookup(L, "btnRed", btnRed);
tableLookup(L, "btnGreen", btnGreen); tableLookup(L, "btnGreen", btnGreen);
tableLookup(L, "btnYellow", btnYellow); tableLookup(L, "btnYellow", btnYellow);
@@ -1327,7 +1336,7 @@ int CLuaInstance::CWindowNew(lua_State *L)
CLuaCWindow **udata = (CLuaCWindow **) lua_newuserdata(L, sizeof(CLuaCWindow *)); CLuaCWindow **udata = (CLuaCWindow **) lua_newuserdata(L, sizeof(CLuaCWindow *));
*udata = new CLuaCWindow(); *udata = new CLuaCWindow();
(*udata)->w = new CComponentsWindow(x, y, dx, dy, name.c_str(), icon.c_str()); (*udata)->w = new CComponentsWindow(x, y, dx, dy, name.c_str(), icon.c_str(), has_shadow, (fb_pixel_t)color_frame, (fb_pixel_t)color_body, (fb_pixel_t)color_shadow);
CComponentsFooter* footer = (*udata)->w->getFooterObject(); CComponentsFooter* footer = (*udata)->w->getFooterObject();
if (footer) { if (footer) {