From efdedf8e6a80b3ebac9798f32a7ea70405be9a8d Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 18 May 2013 23:59:06 +0200 Subject: [PATCH] channellist: colored_events to right infobox Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/273a83fa3f502436bcaa9ba76062768577fdcf83 Author: vanhofen Date: 2013-05-18 (Sat, 18 May 2013) Origin message was: ------------------ - channellist: colored_events to right infobox ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/channellist.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index b1ee4e771..75b8da6b9 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -2262,16 +2262,19 @@ void CChannelList::paint_events(int index) if ((y+ theight+ pig_height + i*ffheight) < (y+ theight+ pig_height + infozone_height)) { bool first = false; + fb_pixel_t color = COL_MENUCONTENTDARK; if (e->eventID) { first = (i == 1); + if ((first) && (g_settings.colored_events_channellist == 1 /* current */) || (!first) && (g_settings.colored_events_channellist == 2 /* next */)) + color = COL_COLORED_EVENTS_CHANNELLIST; struct tm *tmStartZeit = localtime(&e->startTime); strftime(startTime, sizeof(startTime), "%H:%M", tmStartZeit ); //printf("%s %s\n", startTime, e->description.c_str()); startTimeWidth = eventStartTimeWidth; - g_Font[eventFont]->RenderString(x+ width+5, y+ theight+ pig_height + i*ffheight, startTimeWidth, startTime, (g_settings.colored_events_channellist == 2 /* next */) ? COL_COLORED_EVENTS_CHANNELLIST : COL_MENUCONTENTINACTIVE, 0, true); + g_Font[eventFont]->RenderString(x+ width+5, y+ theight+ pig_height + i*ffheight, startTimeWidth, startTime, color, 0, true); } - g_Font[eventFont]->RenderString(x+ width+5+startTimeWidth, y+ theight+ pig_height + i*ffheight, infozone_width - startTimeWidth - 20, e->description, (first) ? COL_MENUHEAD : COL_MENUCONTENTDARK, 0, true); + g_Font[eventFont]->RenderString(x+ width+5+startTimeWidth, y+ theight+ pig_height + i*ffheight, infozone_width - startTimeWidth - 20, e->description, color, 0, true); } else {