From 268bb32b3080725535941d9bd8bb5f90e5e6e766 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 8 Apr 2017 14:11:28 +0200 Subject: [PATCH] epgplus: change toggle colors Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/8a09c7a83f9360f0db0770bfa226ac8071f9e757 Author: vanhofen Date: 2017-04-08 (Sat, 08 Apr 2017) Origin message was: ------------------ - epgplus: change toggle 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, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp index 784928c65..387dbcb5c 100644 --- a/src/gui/epgplus.cpp +++ b/src/gui/epgplus.cpp @@ -155,10 +155,10 @@ void EpgPlus::TimeLine::paint(time_t _startTime, int pduration) // display date of begin this->frameBuffer->paintBoxRel(this->x, this->y, this->width, this->font->getHeight(), - toggleColor ? COL_MENUCONTENT_PLUS_2 : COL_MENUCONTENT_PLUS_1); + COL_MENUCONTENT_PLUS_0); this->font->RenderString(this->x + OFFSET_INNER_MID, this->y + this->font->getHeight(), - this->width, EpgPlus::getTimeString(_startTime, "%d-%b") , COL_MENUCONTENT_TEXT); + this->width, EpgPlus::getTimeString(_startTime, "%d-%b"), COL_MENUCONTENT_TEXT); // paint ticks for (int i = 0; i < numberOfTicks; ++i, xPos += tickDist, tickTime += pduration / numberOfTicks) @@ -168,7 +168,7 @@ void EpgPlus::TimeLine::paint(time_t _startTime, int pduration) xWidth = this->x + width - xPos; this->frameBuffer->paintBoxRel(xPos, this->y, xWidth, this->font->getHeight(), - toggleColor ? COL_MENUCONTENT_PLUS_1 : COL_MENUCONTENT_PLUS_2); + toggleColor ? COL_MENUCONTENT_PLUS_0 : COL_MENUCONTENT_PLUS_1); std::string timeStr = EpgPlus::getTimeString(tickTime, "%H"); @@ -284,7 +284,7 @@ bool EpgPlus::ChannelEventEntry::isSelected(time_t _selectedTime) const void EpgPlus::ChannelEventEntry::paint(bool pisSelected, bool toggleColor) { this->frameBuffer->paintBoxRel(this->x, this->y, this->width, this->font->getHeight(), - this->channelEvent.description.empty()? COL_MENUCONTENT_PLUS_0 : (pisSelected ? COL_MENUCONTENTSELECTED_PLUS_0 : (toggleColor ? COL_MENUCONTENT_PLUS_1 : COL_MENUCONTENT_PLUS_2))); + this->channelEvent.description.empty()? COL_MENUCONTENT_PLUS_0 : (pisSelected ? COL_MENUCONTENTSELECTED_PLUS_0 : (toggleColor ? COL_MENUCONTENT_PLUS_0 : COL_MENUCONTENT_PLUS_1))); this->font->RenderString(this->x + OFFSET_INNER_SMALL, this->y + this->font->getHeight(), this->width - 2*OFFSET_INNER_SMALL > 0 ? this->width - 2*OFFSET_INNER_MIN : 0, this->channelEvent.description, pisSelected ? COL_MENUCONTENTSELECTED_TEXT : COL_MENUCONTENT_TEXT);