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

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Origin commit data
------------------
Commit: b5425ef7ea
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-19 (Fri, 19 Aug 2016)
This commit is contained in:
vanhofen
2016-08-19 22:15:42 +02:00
parent 141df6c65a 5ac8d0085b
commit eb0c679fa9
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/lua/lua_cc_text.cpp
View File

@@ -77,7 +77,7 @@ int CLuaInstCCText::CCTextNew(lua_State *L)
lua_assert(lua_istable(L,1));
CLuaCCWindow* parent = NULL;
lua_Integer x=10, y=10, dx=100, dy=100;
lua_Integer x=10, y=10, dx=-1, dy=-1;
std::string text = "";
std::string tmpMode = "";
lua_Integer mode = CTextBox::AUTO_WIDTH;
@@ -139,6 +139,16 @@ int CLuaInstCCText::CCTextNew(lua_State *L)
}
CComponentsForm* pw = (parent && parent->w) ? parent->w->getBodyObject() : NULL;
if(pw){
if(dx == -1)
dx = pw->getHeight();
if(dy == -1)
dy = pw->getWidth();
}
if(dx == -1)
dx = 100;
if(dy == -1)
dy = 100;
CLuaCCText **udata = (CLuaCCText **) lua_newuserdata(L, sizeof(CLuaCCText *));
*udata = new CLuaCCText();