Merge remote-tracking branch 'tuxbox/master'

This commit is contained in:
Stefan Seyfried
2017-01-22 22:59:39 +01:00
653 changed files with 2136 additions and 2008 deletions

View File

@@ -634,7 +634,7 @@ void CBouquetList::paintItem(int pos)
i_radius = RADIUS_LARGE;
if (i_radius)
frameBuffer->paintBoxRel(x, ypos, width- 15, fheight, bgcolor);
frameBuffer->paintBoxRel(x, ypos, width- 15, fheight, COL_MENUCONTENT_PLUS_0);
frameBuffer->paintBoxRel(x, ypos, width- 15, fheight, bgcolor, i_radius);
if (npos < (int) Bouquets.size())
@@ -691,7 +691,8 @@ void CBouquetList::paintItem(int pos)
void CBouquetList::paintHead()
{
CComponentsHeader header(x, y, width, theight, name);
std::string icon("");
CComponentsHeader header(x, y, width, theight, name, icon, CComponentsHeader::CC_BTN_LEFT | CComponentsHeader::CC_BTN_RIGHT | CComponentsHeader::CC_BTN_MENU);
header.paint(CC_SAVE_SCREEN_NO);
}