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

* channellist.cpp: paint details

Browse Source 
- Rework paintItem2DetailsLine()
- Use CComponentsInfoBox for paintDetails()
- Set missing height of down mark
This commit is contained in:
micha-bbg
2012-08-08 23:56:17 +02:00
committed by Thilo Graf
parent 55a9b0db75
commit 413e224128
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/gui/channellist.cpp
View File

@@ -115,6 +115,8 @@ CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vl
theight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight(); theight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
previous_channellist_additional = -1; previous_channellist_additional = -1;
eventFont = SNeutrinoSettings::FONT_TYPE_CHANNELLIST_EVENT; eventFont = SNeutrinoSettings::FONT_TYPE_CHANNELLIST_EVENT;
dline = NULL;
ibox = NULL;
//printf("************ NEW LIST %s : %x\n", name.c_str(), (int) this);fflush(stdout); //printf("************ NEW LIST %s : %x\n", name.c_str(), (int) this);fflush(stdout);
} }
@@ -122,6 +124,8 @@ CChannelList::~CChannelList()
{ {
//printf("************ DELETE LIST %s : %x\n", name.c_str(), this);fflush(stdout); //printf("************ DELETE LIST %s : %x\n", name.c_str(), this);fflush(stdout);
chanlist.clear(); chanlist.clear();
delete dline;
delete ibox;
} }
void CChannelList::ClearList(void) void CChannelList::ClearList(void)
@@ -1525,7 +1529,11 @@ void CChannelList::paintDetails(int index)
p_event = &chanlist[index]->currentEvent; p_event = &chanlist[index]->currentEvent;
} }
frameBuffer->paintBoxRel(x+2, y + height + 2, full_width-4, info_height - 4, COL_MENUCONTENTDARK_PLUS_0, RADIUS_LARGE);//round //infobox
if (ibox == NULL)
ibox = new CComponentsInfoBox(x, y + height + 2, width, info_height, false);
ibox->setCornerRadius(RADIUS_LARGE);
ibox->paint(false);
if (!p_event->description.empty()) { if (!p_event->description.empty()) {
char cNoch[50] = {0}; // UTF-8 char cNoch[50] = {0}; // UTF-8
@@ -1624,7 +1632,8 @@ void CChannelList::paintDetails(int index)
void CChannelList::clearItem2DetailsLine() void CChannelList::clearItem2DetailsLine()
{ {
paintItem2DetailsLine (-1); if (dline)
dline->kill(); //kill details line
} }
void CChannelList::paintItem2DetailsLine (int pos) void CChannelList::paintItem2DetailsLine (int pos)
@@ -1634,20 +1643,19 @@ void CChannelList::paintItem2DetailsLine (int pos)
int ypos2 = y + height; int ypos2 = y + height;
int ypos1a = ypos1 + (fheight/2)-2; int ypos1a = ypos1 + (fheight/2)-2;
int ypos2a = ypos2 + (info_height/2)-2; int ypos2a = ypos2 + (info_height/2)-2;
fb_pixel_t col1 = COL_MENUCONTENT_PLUS_6;
// Clear // Clear
frameBuffer->paintBackgroundBoxRel(xpos,y, ConnectLineBox_Width, height+info_height + 1); if (dline)
dline->hide();
// paint Line if detail info (and not valid list pos) // paint Line if detail info (and not valid list pos)
if (pos >= 0) { //pos >= 0 && chanlist[ch_index]->currentEvent.description != "") { if (pos >= 0) { //pos >= 0 && chanlist[ch_index]->currentEvent.description != "") {
if(1) // FIXME why -> ? (!g_settings.channellist_extended) if(1) // FIXME why -> ? (!g_settings.channellist_extended)
{ {
//details line if (dline == NULL)
CComponentsDetailLine details_line(xpos, ypos1a, ypos2a, fheight/2+1, info_height-RADIUS_LARGE*2); dline = new CComponentsDetailLine(xpos, ypos1a, ypos2a, fheight/2+1, info_height-RADIUS_LARGE*2);
details_line.paint(); dline->setYPos(ypos1a);
dline->setHMarkDown(info_height-RADIUS_LARGE*2); //required if user has changed osd-settings (corner mode)
//info box frame dline->paint();
frameBuffer->paintBoxFrame(x, ypos2, full_width, info_height, 2, col1, RADIUS_LARGE);
} }
} }
} }

2
src/gui/channellist.h
View File

@@ -95,6 +95,8 @@ private:
int info_height; int info_height;
int ChannelList_Rec; int ChannelList_Rec;
CComponentsDetailLine *dline;
CComponentsInfoBox *ibox;
void paintDetails(int index); void paintDetails(int index);
void clearItem2DetailsLine (); void clearItem2DetailsLine ();