mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 17:01:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/fb-setmode

Browse Source
This commit is contained in:
Thilo Graf
2017-05-11 08:43:29 +02:00
parent 60fed9cc02 1b2f1d320d
commit a26c1bc868
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/components/cc_frm_header.cpp
View File

@@ -330,10 +330,10 @@ void CComponentsHeader::initLogo()
//set final logo position //set final logo position
int x_logo = 0; int x_logo = 0;
if (cch_logo.Align == CC_LOGO_RIGHT){ if (cch_logo.Align == CC_LOGO_RIGHT){
if (cch_caption_align == CTextBox::RIGHT) if (cch_caption_align == CTextBox::RIGHT){
if (cch_text_obj) if (cch_text_obj)
x_logo = cch_text_obj->getXPos() - cch_logo_obj->getWidth(); x_logo = cch_text_obj->getXPos() - cch_logo_obj->getWidth();
else }else
x_logo = x_logo_right; x_logo = x_logo_right;
} }
if (cch_logo.Align == CC_LOGO_LEFT) if (cch_logo.Align == CC_LOGO_LEFT)

2
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, "name", name) || tableLookup(L, "title", name) || tableLookup(L, "caption", name);
tableLookup(L, "icon", icon); tableLookup(L, "icon", icon);
int has_shadow = CC_SHADOW_OFF; lua_Integer has_shadow = CC_SHADOW_OFF;
if (!tableLookup(L, "has_shadow", has_shadow)) { if (!tableLookup(L, "has_shadow", has_shadow)) {
tmp1 = "false"; tmp1 = "false";
if (tableLookup(L, "has_shadow", tmp1)) if (tableLookup(L, "has_shadow", tmp1))