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

This commit is contained in:
Stefan Seyfried
2015-12-28 16:15:14 +01:00
122 changed files with 5543 additions and 2589 deletions

View File

@@ -46,7 +46,7 @@
#include <gui/widget/buttons.h>
#include <gui/widget/icons.h>
#include <gui/widget/messagebox.h>
#include <gui/infoclock.h>
#include <driver/display.h>
#include <driver/fontrenderer.h>
#include <driver/screen_max.h>
@@ -636,6 +636,7 @@ int CBouquetList::show(bool bShowChannelList)
void CBouquetList::hide()
{
frameBuffer->paintBackgroundBoxRel(x,y, width,height+10);
CInfoClock::getInstance()->enableInfoClock(!CInfoClock::getInstance()->isBlocked());
}
void CBouquetList::paintItem(int pos)
@@ -703,6 +704,8 @@ void CBouquetList::paintHead()
void CBouquetList::paint()
{
//ensure stop info clock before paint this window
CInfoClock::getInstance()->disableInfoClock();
liststart = (selected/listmaxshow)*listmaxshow;
int lastnum = liststart + listmaxshow;
int bsize = Bouquets.empty() ? 1 : Bouquets.size();