mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 08:21:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Clock on infoviewer and channellist: Fix background paint...

Browse Source 
...when switching between OneColor und ColorToColor


Origin commit data
------------------
Branch: ni/coolstream
Commit: 95a27ebb31
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-05-09 (Sat, 09 May 2015)



------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2015-05-09 09:50:39 +02:00
parent 3764627637
commit 84d05b6a93
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/channellist.cpp
View File

@@ -2064,7 +2064,8 @@ void CChannelList::paint()
void CChannelList::paintHead() void CChannelList::paintHead()
{ {
static int gradient = g_settings.theme.menu_Head_gradient; static int gradient_head = g_settings.theme.menu_Head_gradient;
static int gradient_c2c = g_settings.theme.gradient_c2c;
CComponentsHeader header(x, y, full_width, theight, name /*no header icon*/); CComponentsHeader header(x, y, full_width, theight, name /*no header icon*/);
if (bouquet && bouquet->zapitBouquet && bouquet->zapitBouquet->bLocked != g_settings.parentallock_defaultlocked) if (bouquet && bouquet->zapitBouquet && bouquet->zapitBouquet->bLocked != g_settings.parentallock_defaultlocked)
@@ -2074,8 +2075,9 @@ void CChannelList::paintHead()
header.paint(CC_SAVE_SCREEN_NO); header.paint(CC_SAVE_SCREEN_NO);
if (gradient != g_settings.theme.menu_Head_gradient && headerClock != NULL) { if ((gradient_head != g_settings.theme.menu_Head_gradient || gradient_c2c != g_settings.theme.gradient_c2c) && headerClock != NULL) {
gradient = g_settings.theme.menu_Head_gradient; gradient_head = g_settings.theme.menu_Head_gradient;
gradient_c2c = g_settings.theme.gradient_c2c;
headerClock->clearSavedScreen(); headerClock->clearSavedScreen();
delete headerClock; delete headerClock;
headerClock = NULL; headerClock = NULL;
@@ -2086,8 +2088,8 @@ void CChannelList::paintHead()
headerClock = new CComponentsFrmClock(0, 0, 0, 0, "%H:%M", true); headerClock = new CComponentsFrmClock(0, 0, 0, 0, "%H:%M", true);
headerClock->setClockBlink("%H %M"); headerClock->setClockBlink("%H %M");
headerClock->setClockIntervall(1); headerClock->setClockIntervall(1);
headerClock->doPaintBg(!gradient); headerClock->doPaintBg(!gradient_head);
headerClock->enableTboxSaveScreen(gradient); headerClock->enableTboxSaveScreen(gradient_head);
headerClock->setCorner(RADIUS_LARGE, CORNER_TOP_RIGHT); headerClock->setCorner(RADIUS_LARGE, CORNER_TOP_RIGHT);
} }
headerClock->setClockFont(SNeutrinoSettings::FONT_TYPE_MENU_TITLE); headerClock->setClockFont(SNeutrinoSettings::FONT_TYPE_MENU_TITLE);

4
src/gui/infoviewer.cpp
View File

@@ -248,9 +248,11 @@ void CInfoViewer::initClock()
{ {
static int gradient_top = g_settings.theme.infobar_gradient_top; static int gradient_top = g_settings.theme.infobar_gradient_top;
static int gradient_c2c = g_settings.theme.gradient_c2c;
if (gradient_top != g_settings.theme.infobar_gradient_top && clock != NULL) { if ((gradient_top != g_settings.theme.infobar_gradient_top || gradient_c2c != g_settings.theme.gradient_c2c) && clock != NULL) {
gradient_top = g_settings.theme.infobar_gradient_top; gradient_top = g_settings.theme.infobar_gradient_top;
gradient_c2c = g_settings.theme.gradient_c2c;
clock->clearSavedScreen(); clock->clearSavedScreen();
delete clock; delete clock;
clock = NULL; clock = NULL;