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

channellist: allow show/hide bottom infobox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7f35a67426
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-14 (Tue, 14 Apr 2015)

Origin message was:
------------------
- channellist: allow show/hide bottom infobox

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2015-04-14 11:08:24 +02:00
parent 764ca42629
commit 21b3e320aa
10 changed files with 45 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/gui/channellist.cpp
View File

@@ -469,7 +469,10 @@ void CChannelList::calcSize()
width = full_width;
// calculate height (the infobox below mainbox is handled outside height)
info_height = 2*fheight + fdescrheight + 10;
if (g_settings.channellist_show_infobox)
info_height = 2*fheight + fdescrheight + 10;
else
info_height = 0;
height = pig_on_win ? frameBuffer->getScreenHeight(): frameBuffer->getScreenHeightRel();
height = height - info_height;
@@ -1500,6 +1503,9 @@ bool CChannelList::quickZap(int key, bool /* cycle */)
void CChannelList::paintDetails(int index)
{
if (!g_settings.channellist_show_infobox)
return;
CChannelEvent *p_event = NULL;
//colored_events init
@@ -1616,13 +1622,6 @@ void CChannelList::paintDetails(int index)
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_DESCR]->RenderString(x+ full_width- 10- from_len, y+ height+ 5+ 2*fheight+ fdescrheight, from_len, cFrom, colored_event_N ? COL_COLORED_EVENTS_TEXT : COL_MENUCONTENTDARK_TEXT);
}
}
if ((g_settings.channellist_additional) && (p_event != NULL))
{
if (displayList)
paint_events(index);
else
showdescription(selected);
}
}
void CChannelList::clearItem2DetailsLine()
@@ -1632,6 +1631,9 @@ void CChannelList::clearItem2DetailsLine()
void CChannelList::paintItem2DetailsLine (int pos)
{
if (!g_settings.channellist_show_infobox)
return;
int xpos = x - ConnectLineBox_Width;
int ypos1 = y + theight + pos*fheight + (fheight/2)-2;
int ypos2 = y + height + (info_height/2)-2;
@@ -1650,6 +1652,17 @@ void CChannelList::paintItem2DetailsLine (int pos)
}
}
void CChannelList::paintAdditionals(int index)
{
if (g_settings.channellist_additional)
{
if (displayList)
paint_events(index);
else
showdescription(selected);
}
}
void CChannelList::showChannelLogo()
{
if ((*chanlist).empty())
@@ -1823,6 +1836,7 @@ void CChannelList::paintItem(int pos, const bool firstpaint)
bgcolor = COL_MENUCONTENTSELECTED_PLUS_0;
paintItem2DetailsLine (pos);
paintDetails(curr);
paintAdditionals(curr);
c_rad_small = RADIUS_LARGE;
paintbuttons = true;
}