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

Merge remote-tracking branch 'test/cst-next'

Browse Source 
Conflicts:
	src/gui/osdlang_setup.cpp
This commit is contained in:
Stefan Seyfried
2015-02-19 14:10:26 +01:00
parent 51bbb756e8 d1ca82ab44
commit 48fdfc5e5e
23 changed files with 86 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/gui/luainstance.cpp
View File

@@ -1806,25 +1806,33 @@ int CLuaInstance::CWindowNew(lua_State *L)
else {
CComponentsFooter* footer = (*udata)->w->getFooterObject();
if (footer) {
int btnCount = 0;
if (!btnRed.empty()) btnCount++;
if (!btnGreen.empty()) btnCount++;
if (!btnYellow.empty()) btnCount++;
if (!btnBlue.empty()) btnCount++;
if (btnCount) {
fb_pixel_t col = footer->getColorBody();
int btnw = (dx-20) / btnCount;
int btnh = footer->getHeight();
int start = 10;
if (!btnRed.empty())
footer->addCCItem(new CComponentsButtonRed(start, CC_CENTERED, btnw, btnh, btnRed, 0, false , true, false, col, col));
if (!btnGreen.empty())
footer->addCCItem(new CComponentsButtonGreen(start+=btnw, CC_CENTERED, btnw, btnh, btnGreen, 0, false , true, false, col, col));
if (!btnYellow.empty())
footer->addCCItem(new CComponentsButtonYellow(start+=btnw, CC_CENTERED, btnw, btnh, btnYellow, 0, false , true, false, col, col));
if (!btnBlue.empty())
footer->addCCItem(new CComponentsButtonBlue(start+=btnw, CC_CENTERED, btnw, btnh, btnBlue, 0, false , true, false, col, col));
vector<button_label_s> buttons;
if (!btnRed.empty()){
button_label_s btnSred;
btnSred.button = NEUTRINO_ICON_BUTTON_RED;
btnSred.text = btnRed;
buttons.push_back(btnSred);
}
if (!btnGreen.empty()){
button_label_s btnSgreen;
btnSgreen.button = NEUTRINO_ICON_BUTTON_GREEN;
btnSgreen.text = btnGreen;
buttons.push_back(btnSgreen);
}
if (!btnYellow.empty()){
button_label_s btnSyellow;
btnSyellow.button = NEUTRINO_ICON_BUTTON_YELLOW;
btnSyellow.text = btnYellow;
buttons.push_back(btnSyellow);
}
if (!btnBlue.empty()){
button_label_s btnSblue;
btnSblue.button = NEUTRINO_ICON_BUTTON_YELLOW;
btnSblue.text = btnBlue;
buttons.push_back(btnSblue);
}
if(!buttons.empty())
footer->setButtonLabels(buttons, dx-20, (dx-20) / (buttons.size()+1));
}
}