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

- timerlist: use getItemColors function

Browse Source
This commit is contained in:
svenhoefer
2016-10-19 10:06:36 +02:00
parent 7f23b1ca38
commit a38158919d
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/gui/timerlist.cpp
View File

@@ -659,36 +659,36 @@ void CTimerList::paintItem(int pos)
{ {
int ypos = y+ theight+ pos*fheight*2; int ypos = y+ theight+ pos*fheight*2;
fb_pixel_t color;
fb_pixel_t bgcolor;
int real_width=width; int real_width=width;
if (timerlist.size() > listmaxshow) if (timerlist.size() > listmaxshow)
{ {
real_width-=15; //scrollbar real_width-=15; //scrollbar
} }
color = COL_MENUCONTENT_TEXT; unsigned int currpos = liststart + pos;
if (pos & 1)
bgcolor = COL_MENUCONTENT_PLUS_1; bool i_selected = currpos == (unsigned) selected;
else bool i_marked = false;
bgcolor = COL_MENUCONTENT_PLUS_0; bool i_switch = false; //pos & 1;
int i_radius = RADIUS_NONE;
fb_pixel_t color;
fb_pixel_t bgcolor;
getItemColors(color, bgcolor, i_selected, i_marked, i_switch);
if (i_selected || i_marked)
i_radius = RADIUS_LARGE;
if (i_radius)
frameBuffer->paintBoxRel(x, ypos, real_width, 2*fheight, COL_MENUCONTENT_PLUS_0);
frameBuffer->paintBoxRel(x, ypos, real_width, 2*fheight, bgcolor, i_radius);
//shadow //shadow
frameBuffer->paintBoxRel(x + width, ypos, OFFSET_SHADOW, 2*fheight, COL_SHADOW_PLUS_0); frameBuffer->paintBoxRel(x + width, ypos, OFFSET_SHADOW, 2*fheight, COL_SHADOW_PLUS_0);
//item
frameBuffer->paintBoxRel(x, ypos, real_width, 2*fheight, bgcolor);
if (liststart + pos == selected) if (currpos < timerlist.size())
{ {
color = COL_MENUCONTENTSELECTED_TEXT; CTimerd::responseGetTimer & timer = timerlist[currpos];
bgcolor = COL_MENUCONTENTSELECTED_PLUS_0;
}
//selected item
frameBuffer->paintBoxRel(x,ypos, real_width, 2*fheight, bgcolor, RADIUS_MID);
if (liststart + pos < (int)timerlist.size())
{
CTimerd::responseGetTimer & timer = timerlist[liststart+pos];
char zAlarmTime[25] = {0}; char zAlarmTime[25] = {0};
struct tm *alarmTime = localtime(&(timer.alarmTime)); struct tm *alarmTime = localtime(&(timer.alarmTime));
strftime(zAlarmTime,20,"%d.%m. %H:%M",alarmTime); strftime(zAlarmTime,20,"%d.%m. %H:%M",alarmTime);
@@ -802,7 +802,7 @@ void CTimerList::paintItem(int pos)
} }
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+fw*13,ypos+2*fheight, real_width-(fw*13+5), zAddData, color, fheight); g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+fw*13,ypos+2*fheight, real_width-(fw*13+5), zAddData, color, fheight);
// LCD Display // LCD Display
if (liststart+pos==selected) if (currpos == (unsigned) selected)
{ {
std::string line1 = convertTimerType2String(timer.eventType); // UTF-8 std::string line1 = convertTimerType2String(timer.eventType); // UTF-8
//std::string line2 = zAlarmTime; //std::string line2 = zAlarmTime;