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

Merge branch 'cst-next.pre' into cst-next

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: a58f1621b4
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-30 (Thu, 30 Apr 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2015-04-30 09:20:43 +02:00
parent 2af16e6a08 2d1fb7b8ef
commit 946c0e8bc4
81 changed files with 909 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/channellist.cpp
View File

@@ -1681,9 +1681,16 @@ void CChannelList::showChannelLogo()
CChannelLogo->hide();
delete CChannelLogo;
}
CChannelLogo = new CComponentsChannelLogo(0, 0, logo_w_max, theight,
(*chanlist)[selected]->getName(), (*chanlist)[selected]->channel_id);
if (CChannelLogo->hasLogo()) {
CChannelLogo = new CComponentsChannelLogoScalable(0, 0, (*chanlist)[selected]->getName(), (*chanlist)[selected]->channel_id);
if (CChannelLogo->hasLogo()){
int h_logo = CChannelLogo->getHeight();
if (h_logo > theight){ //scale image if required, TODO: move into an own handler, eg. header, so channel logo should be paint in header object
uint8_t h_ratio = uint8_t(theight*100/h_logo);
CChannelLogo->setHeight(theight);
int w_logo = h_ratio*CChannelLogo->getWidth()/100;
CChannelLogo->setWidth(min(w_logo, logo_w_max));
}
CChannelLogo->setXPos(x + full_width - logo_off - CChannelLogo->getWidth());
CChannelLogo->setYPos(y + (theight - CChannelLogo->getHeight()) / 2);
CChannelLogo->paint();
@@ -2061,7 +2068,7 @@ void CChannelList::paint()
void CChannelList::paintHead()
{
static int gradient = g_settings.gradiant;
static int gradient = g_settings.theme.menu_Head_gradient;
CComponentsHeader header(x, y, full_width, theight, name /*no header icon*/);
if (bouquet && bouquet->zapitBouquet && bouquet->zapitBouquet->bLocked != g_settings.parentallock_defaultlocked)
@@ -2071,8 +2078,8 @@ void CChannelList::paintHead()
header.paint(CC_SAVE_SCREEN_NO);
if (gradient != g_settings.gradiant && headerClock != NULL) {
gradient = g_settings.gradiant;
if (gradient != g_settings.theme.menu_Head_gradient && headerClock != NULL) {
gradient = g_settings.theme.menu_Head_gradient;
headerClock->clearSavedScreen();
delete headerClock;
headerClock = NULL;