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

CLuaInstance: Fix commit 79b8a95524

Browse Source 
- Use return value from checkMagicMask() for color


Origin commit data
------------------
Branch: ni/coolstream
Commit: a7790ce049
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-01 (Fri, 01 Jan 2016)



------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2016-01-01 14:41:53 +01:00
parent 710892b516
commit ea68425f82
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,9 +104,9 @@ int CLuaInstCCWindow::CCWindowNew(lua_State *L)
tableLookup(L, "btnYellow", btnYellow);
tableLookup(L, "btnBlue", btnBlue);
checkMagicMask(color_frame);
checkMagicMask(color_body);
checkMagicMask(color_shadow);
color_frame = checkMagicMask(color_frame);
color_body = checkMagicMask(color_body);
color_shadow = checkMagicMask(color_shadow);
bool show_header = true;
if (!tableLookup(L, "show_header", show_header)) {
@@ -227,15 +227,15 @@ int CLuaInstCCWindow::CCWindowSetWindowColor(lua_State *L)
lua_Unsigned color;
if (tableLookup(L, "color_frame" , color)) {
checkMagicMask(color);
color = checkMagicMask(color);
D->w->setColorFrame(color);
}
if (tableLookup(L, "color_body" , color)) {
checkMagicMask(color);
color = checkMagicMask(color);
D->w->setColorBody(color);
}
if (tableLookup(L, "color_shadow" , color)) {
checkMagicMask(color);
color = checkMagicMask(color);
D->w->setColorShadow(color);
}