mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/filebrowser.cpp
	src/gui/pictureviewer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 42d1c25a8b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-19 (Wed, 19 Oct 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-19 10:22:43 +02:00
parent cfe223716c b2facb1e28
commit 83f403dfb7
17 changed files with 311 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/gui/pictureviewer.cpp
View File

@@ -679,39 +679,33 @@ void CPictureViewerGui::paintItem(int pos)
// printf("paintItem{\n");
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 bgcolor;
//NI - don't darken every second entry
#if 0
if ((liststart+pos < playlist.size()) && (pos & 1) )
{
color = COL_MENUCONTENTDARK_TEXT;
bgcolor = COL_MENUCONTENTDARK_PLUS_0;
}
else
#endif
{
color = COL_MENUCONTENT_TEXT;
bgcolor = COL_MENUCONTENT_PLUS_0;
}
getItemColors(color, bgcolor, i_selected, i_marked, i_switch);
if (liststart+pos == selected)
{
frameBuffer->paintBoxRel(x,ypos, width-15, fheight, bgcolor);
color = COL_MENUCONTENTSELECTED_TEXT;
bgcolor = COL_MENUCONTENTSELECTED_PLUS_0;
}
if (i_selected || i_marked)
i_radius = RADIUS_LARGE;
frameBuffer->paintBoxRel(x, ypos, width-15, fheight, bgcolor, liststart+pos == selected ? RADIUS_LARGE : 0);
if (liststart+pos<playlist.size())
if (i_radius)
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 += playlist[liststart+pos].Type;
tmp += playlist[currpos].Type;
tmp += ')';
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);
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);