From 84d05b6a9333e1659ff06e8fbb0b4da3368663bf Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Sat, 9 May 2015 09:50:39 +0200 Subject: [PATCH] Clock on infoviewer and channellist: Fix background paint... ...when switching between OneColor und ColorToColor Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/95a27ebb3116a6838cfb44ee2bfe5eb3e67f3885 Author: Michael Liebmann Date: 2015-05-09 (Sat, 09 May 2015) ------------------ This commit was generated by Migit --- src/gui/channellist.cpp | 12 +++++++----- src/gui/infoviewer.cpp | 4 +++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index e895c5620..baa3d4112 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -2064,7 +2064,8 @@ void CChannelList::paint() 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*/); if (bouquet && bouquet->zapitBouquet && bouquet->zapitBouquet->bLocked != g_settings.parentallock_defaultlocked) @@ -2074,8 +2075,9 @@ void CChannelList::paintHead() header.paint(CC_SAVE_SCREEN_NO); - if (gradient != g_settings.theme.menu_Head_gradient && headerClock != NULL) { - gradient = g_settings.theme.menu_Head_gradient; + if ((gradient_head != g_settings.theme.menu_Head_gradient || gradient_c2c != g_settings.theme.gradient_c2c) && headerClock != NULL) { + gradient_head = g_settings.theme.menu_Head_gradient; + gradient_c2c = g_settings.theme.gradient_c2c; headerClock->clearSavedScreen(); delete headerClock; headerClock = NULL; @@ -2086,8 +2088,8 @@ void CChannelList::paintHead() headerClock = new CComponentsFrmClock(0, 0, 0, 0, "%H:%M", true); headerClock->setClockBlink("%H %M"); headerClock->setClockIntervall(1); - headerClock->doPaintBg(!gradient); - headerClock->enableTboxSaveScreen(gradient); + headerClock->doPaintBg(!gradient_head); + headerClock->enableTboxSaveScreen(gradient_head); headerClock->setCorner(RADIUS_LARGE, CORNER_TOP_RIGHT); } headerClock->setClockFont(SNeutrinoSettings::FONT_TYPE_MENU_TITLE); diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index e2813a6c2..1976c5ce9 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -248,9 +248,11 @@ void CInfoViewer::initClock() { 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_c2c = g_settings.theme.gradient_c2c; clock->clearSavedScreen(); delete clock; clock = NULL;