From 95b8665a76b557ee81d1ff62f03ea3c1f1abb368 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 8 Apr 2017 14:11:27 +0200 Subject: [PATCH] epgplus: do not toggle text colors Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/ebc7734ad2f3da8d02ea139d0f0c91192346bd62 Author: vanhofen Date: 2017-04-08 (Sat, 08 Apr 2017) Origin message was: ------------------ - epgplus: do not toggle text colors ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/epgplus.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp index 46b4cc261..77ebd93e6 100644 --- a/src/gui/epgplus.cpp +++ b/src/gui/epgplus.cpp @@ -60,8 +60,6 @@ #include #include -#define COL_MENUCONTENT_P1 COL_MENUCONTENT_TEXT_PLUS_1 -#define COL_MENUCONTENT_P2 COL_MENUCONTENT_TEXT_PLUS_2 extern CBouquetList *bouquetList; Font * fonts[EpgPlus::NumberOfFontSettings]; @@ -199,12 +197,12 @@ void EpgPlus::TimeLine::paint(time_t _startTime, int pduration) int textWidth = this->fontTime->getRenderWidth(timeStr); this->fontTime->RenderString(xPos - textWidth - 4, this->y + this->fontTime->getHeight(), - textWidth, timeStr, toggleColor ? COL_MENUCONTENT_P1 : COL_MENUCONTENT_P2); + textWidth, timeStr, COL_MENUCONTENT_TEXT); timeStr = EpgPlus::getTimeString(tickTime, "%M"); textWidth = this->fontTime->getRenderWidth(timeStr); this->fontTime->RenderString(xPos + 4, this->y + this->fontTime->getHeight(), - textWidth, timeStr, toggleColor ? COL_MENUCONTENT_P1 : COL_MENUCONTENT_P2); + textWidth, timeStr, COL_MENUCONTENT_TEXT); toggleColor = !toggleColor; } @@ -304,7 +302,7 @@ void EpgPlus::ChannelEventEntry::paint(bool pisSelected, bool toggleColor) this->channelEvent.description.empty()? COL_MENUCONTENT_PLUS_0 : (pisSelected ? COL_MENUCONTENTSELECTED_PLUS_0 : (toggleColor ? COL_MENUCONTENT_PLUS_1 : COL_MENUCONTENT_PLUS_2))); this->font->RenderString(this->x + 2, this->y + this->font->getHeight(), - this->width - 4 > 0 ? this->width - 4 : 0, this->channelEvent.description, pisSelected ? COL_MENUCONTENTSELECTED_TEXT : (toggleColor ? COL_MENUCONTENT_P1 : COL_MENUCONTENT_P2)); + this->width - 4 > 0 ? this->width - 4 : 0, this->channelEvent.description, pisSelected ? COL_MENUCONTENTSELECTED_TEXT : COL_MENUCONTENT_TEXT); // paint the separation line if (separationLineHeight > 0)