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

- bookmarkmanager: use getItemColors function

Browse Source
This commit is contained in:
svenhoefer
2016-10-19 10:06:35 +02:00
parent 2040d7558a
commit 89d373ed05
1 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/gui/bookmarkmanager.cpp
View File

@@ -364,25 +364,16 @@ void CBookmarkManager::paintItem(int pos)
{ {
int ypos = y+ theight+0 + pos*fheight*2; int ypos = y+ theight+0 + pos*fheight*2;
unsigned int currpos = liststart + pos;
bool i_selected = currpos == selected;
bool i_marked = false;
bool i_switch = false; //(currpos < bookmarks.size()) && (pos & 1);
fb_pixel_t color; fb_pixel_t color;
fb_pixel_t bgcolor; fb_pixel_t bgcolor;
if (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)
{
color = COL_MENUCONTENTSELECTED_TEXT;
bgcolor = COL_MENUCONTENTSELECTED_PLUS_0;
}
int real_width=width; int real_width=width;
if (bookmarks.size()>listmaxshow) if (bookmarks.size()>listmaxshow)
@@ -391,14 +382,14 @@ void CBookmarkManager::paintItem(int pos)
} }
frameBuffer->paintBoxRel(x,ypos, real_width, 2*fheight, bgcolor); frameBuffer->paintBoxRel(x,ypos, real_width, 2*fheight, bgcolor);
if (liststart+pos<bookmarks.size()) if (currpos < bookmarks.size())
{ {
CBookmark theBookmark = bookmarks[liststart+pos]; CBookmark theBookmark = bookmarks[currpos];
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+10,ypos+fheight, real_width-10, theBookmark.getName(), color, fheight); g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+10,ypos+fheight, real_width-10, theBookmark.getName(), color, fheight);
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+10,ypos+2*fheight, real_width-10, theBookmark.getUrl(), color, fheight); g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+10,ypos+2*fheight, real_width-10, theBookmark.getUrl(), color, fheight);
// LCD Display // LCD Display
if (liststart+pos==selected) if (i_selected)
{ {
CVFD::getInstance()->showMenuText(0, theBookmark.getName(), -1, true); // UTF-8 CVFD::getInstance()->showMenuText(0, theBookmark.getName(), -1, true); // UTF-8
CVFD::getInstance()->showMenuText(1, theBookmark.getUrl(), -1, true); // UTF-8 CVFD::getInstance()->showMenuText(1, theBookmark.getUrl(), -1, true); // UTF-8