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

CLuaInstance::ComponentsTextNew: Add 'parent' parameter...

Browse Source 
...for the integration of ctext in a parent cwindow
This commit is contained in:
M. Liebmann
2014-03-16 11:56:53 +01:00
parent f4c70c96a5
commit 81608cbd3f
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/gui/luainstance.cpp
View File

@@ -1553,6 +1553,7 @@ int CLuaInstance::ComponentsTextNew(lua_State *L)
{ {
lua_assert(lua_istable(L,1)); lua_assert(lua_istable(L,1));
CLuaCWindow* parent = NULL;
int x=10, y=10, dx=100, dy=100; int x=10, y=10, dx=100, dy=100;
std::string text = ""; std::string text = "";
std::string tmpMode = ""; std::string tmpMode = "";
@@ -1564,6 +1565,7 @@ int CLuaInstance::ComponentsTextNew(lua_State *L)
lua_Integer color_shadow = (lua_Integer)COL_MENUCONTENTDARK_PLUS_0; lua_Integer color_shadow = (lua_Integer)COL_MENUCONTENTDARK_PLUS_0;
std::string tmp1 = "false"; std::string tmp1 = "false";
tableLookup(L, "parent" , (void**)&parent);
tableLookup(L, "x" , x); tableLookup(L, "x" , x);
tableLookup(L, "y" , y); tableLookup(L, "y" , y);
tableLookup(L, "dx" , dx); tableLookup(L, "dx" , dx);
@@ -1602,9 +1604,12 @@ int CLuaInstance::ComponentsTextNew(lua_State *L)
htmlEntityDecode(text); htmlEntityDecode(text);
} }
CComponentsForm* pw = (parent && parent->w) ? parent->w->getBodyObject() : NULL;
CLuaComponentsText **udata = (CLuaComponentsText **) lua_newuserdata(L, sizeof(CLuaComponentsText *)); CLuaComponentsText **udata = (CLuaComponentsText **) lua_newuserdata(L, sizeof(CLuaComponentsText *));
*udata = new CLuaComponentsText(); *udata = new CLuaComponentsText();
(*udata)->ct = new CComponentsText(x, y, dx, dy, text, mode, g_Font[font_text], NULL, has_shadow, (fb_pixel_t)color_text, (fb_pixel_t)color_frame, (fb_pixel_t)color_body, (fb_pixel_t)color_shadow); (*udata)->ct = new CComponentsText(x, y, dx, dy, text, mode, g_Font[font_text], pw, has_shadow, (fb_pixel_t)color_text, (fb_pixel_t)color_frame, (fb_pixel_t)color_body, (fb_pixel_t)color_shadow);
(*udata)->parent = pw;
luaL_getmetatable(L, "ctext"); luaL_getmetatable(L, "ctext");
lua_setmetatable(L, -2); lua_setmetatable(L, -2);
return 1; return 1;
@@ -1613,14 +1618,13 @@ int CLuaInstance::ComponentsTextNew(lua_State *L)
int CLuaInstance::ComponentsTextPaint(lua_State *L) int CLuaInstance::ComponentsTextPaint(lua_State *L)
{ {
lua_assert(lua_istable(L,1)); lua_assert(lua_istable(L,1));
CLuaComponentsText *m = ComponentsTextCheck(L, 1);
if (!m) return 0;
std::string tmp = "true"; std::string tmp = "true";
tableLookup(L, "do_save_bg", tmp); tableLookup(L, "do_save_bg", tmp);
bool do_save_bg = (tmp == "true" || tmp == "1" || tmp == "yes"); bool do_save_bg = (tmp == "true" || tmp == "1" || tmp == "yes");
CLuaComponentsText *m = ComponentsTextCheck(L, 1);
if (!m)
return 0;
m->ct->paint(do_save_bg); m->ct->paint(do_save_bg);
return 0; return 0;
} }
@@ -1628,29 +1632,28 @@ int CLuaInstance::ComponentsTextPaint(lua_State *L)
int CLuaInstance::ComponentsTextHide(lua_State *L) int CLuaInstance::ComponentsTextHide(lua_State *L)
{ {
lua_assert(lua_istable(L,1)); lua_assert(lua_istable(L,1));
CLuaComponentsText *m = ComponentsTextCheck(L, 1);
if (!m) return 0;
std::string tmp = "false"; std::string tmp = "false";
tableLookup(L, "no_restore", tmp); tableLookup(L, "no_restore", tmp);
bool no_restore = (tmp == "true" || tmp == "1" || tmp == "yes"); bool no_restore = (tmp == "true" || tmp == "1" || tmp == "yes");
CLuaComponentsText *m = ComponentsTextCheck(L, 1);
if (!m)
return 0;
m->ct->hide(no_restore); m->ct->hide(no_restore);
return 0; return 0;
} }
int CLuaInstance::ComponentsTextScroll(lua_State *L) int CLuaInstance::ComponentsTextScroll(lua_State *L)
{ {
lua_assert(lua_istable(L,1)); lua_assert(lua_istable(L,1));
CLuaComponentsText *m = ComponentsTextCheck(L, 1);
if (!m) return 0;
std::string tmp = "true"; std::string tmp = "true";
tableLookup(L, "dir", tmp); tableLookup(L, "dir", tmp);
bool scrollDown = (tmp == "down" || tmp == "1"); bool scrollDown = (tmp == "down" || tmp == "1");
CLuaComponentsText *m = ComponentsTextCheck(L, 1);
if (!m)
return 0;
//get the textbox instance from lua object and use CTexBbox scroll methods //get the textbox instance from lua object and use CTexBbox scroll methods
CTextBox* ctb = m->ct->getCTextBoxObject(); CTextBox* ctb = m->ct->getCTextBoxObject();
if (ctb) { if (ctb) {

5
src/gui/luainstance.h
View File

@@ -138,8 +138,9 @@ class CLuaComponentsText
{ {
public: public:
CComponentsText *ct; CComponentsText *ct;
CLuaComponentsText() { ct = NULL; } CComponentsForm *parent;
~CLuaComponentsText() { delete ct; } CLuaComponentsText() { ct = NULL; parent = NULL;}
~CLuaComponentsText() { if (parent == NULL) delete ct; }
}; };