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

- pictureviewer: use getItemColors function

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

39
src/gui/pictureviewer.cpp
View File

@@ -668,36 +668,33 @@ void CPictureViewerGui::paintItem(int pos)
// printf("paintItem{\n"); // printf("paintItem{\n");
int ypos = y+ theight + 0 + pos*fheight; int ypos = y+ theight + 0 + pos*fheight;
unsigned int currpos = liststart + pos;
bool i_selected = currpos == selected;
bool i_marked = false;
bool i_switch = false; //(currpos < playlist.size()) && (pos & 1);
int i_radius = RADIUS_NONE;
fb_pixel_t color; fb_pixel_t color;
fb_pixel_t bgcolor; fb_pixel_t bgcolor;
if ((liststart+pos < playlist.size()) && (pos & 1) ) getItemColors(color, bgcolor, i_selected, i_marked, i_switch);
{
color = COL_MENUCONTENTDARK_TEXT;
bgcolor = COL_MENUCONTENTDARK_PLUS_0;
}
else
{
color = COL_MENUCONTENT_TEXT;
bgcolor = COL_MENUCONTENT_PLUS_0;
}
if (liststart+pos == selected) if (i_selected || i_marked)
{ i_radius = RADIUS_LARGE;
frameBuffer->paintBoxRel(x,ypos, width-15, fheight, bgcolor);
color = COL_MENUCONTENTSELECTED_TEXT;
bgcolor = COL_MENUCONTENTSELECTED_PLUS_0;
}
frameBuffer->paintBoxRel(x, ypos, width-15, fheight, bgcolor, liststart+pos == selected ? RADIUS_LARGE : 0); if (i_radius)
if (liststart+pos<playlist.size()) frameBuffer->paintBoxRel(x, ypos, width - 15, fheight, COL_MENUCONTENT_PLUS_0);
frameBuffer->paintBoxRel(x, ypos, width - 15, fheight, bgcolor, i_radius);
if (currpos < playlist.size())
{ {
std::string tmp = playlist[liststart+pos].Name; std::string tmp = playlist[currpos].Name;
tmp += " ("; tmp += " (";
tmp += playlist[liststart+pos].Type; tmp += playlist[currpos].Type;
tmp += ')'; tmp += ')';
char timestring[18]; char timestring[18];
strftime(timestring, 18, "%d-%m-%Y %H:%M", gmtime(&playlist[liststart+pos].Date)); strftime(timestring, 18, "%d-%m-%Y %H:%M", gmtime(&playlist[currpos].Date));
int w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(timestring); int w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(timestring);
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+10,ypos+fheight, width-30 - w, tmp, color, fheight); g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+10,ypos+fheight, width-30 - w, tmp, color, fheight);
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+width-20-w,ypos+fheight, w, timestring, color, fheight); g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+width-20-w,ypos+fheight, w, timestring, color, fheight);