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

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

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: ad61c7e183
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-12 (Fri, 12 May 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
gixxpunk
2017-05-12 08:42:16 +02:00
parent bdf96065fb a8f3d88872
commit c43e77c038
12 changed files with 103 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -89,7 +89,7 @@ int CLuaInstCCWindow::CCWindowNew(lua_State *L)
tableLookup(L, "name", name) || tableLookup(L, "title", name) || tableLookup(L, "caption", name);
tableLookup(L, "icon", icon);
int has_shadow = CC_SHADOW_OFF;
lua_Integer has_shadow = CC_SHADOW_OFF;
if (!tableLookup(L, "has_shadow", has_shadow)) {
tmp1 = "false";
if (tableLookup(L, "has_shadow", tmp1))
@@ -221,10 +221,10 @@ int CLuaInstCCWindow::CCWindowSetCaption(lua_State *L)
std::string name = "";
tableLookup(L, "name", name) || tableLookup(L, "title", name) || tableLookup(L, "caption", name);
lua_Integer alignment = (lua_Integer)CTextBox::NO_AUTO_LINEBREAK;
lua_Integer alignment = (lua_Integer)DEFAULT_TITLE_ALIGN;
tableLookup(L, "alignment", alignment);
D->w->setWindowCaption(name, alignment | (lua_Integer)CTextBox::NO_AUTO_LINEBREAK);
D->w->setWindowCaption(name, (cc_title_alignment_t)alignment);
return 0;
}

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

@@ -29,7 +29,7 @@ class CLuaCCWindow
~CLuaCCWindow() { delete w; }
};
class CLuaInstCCWindow
class CLuaInstCCWindow : CCHeaderTypes
{
public:
CLuaInstCCWindow() {};