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

CChannelList: fix position of minitv, small cleanups

Browse Source 
This is only a provisionally fix. A rework of initialisation for
many member variables seems to be necessary.


Origin commit data
------------------
Branch: ni/coolstream
Commit: fedb9132d7
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-02-22 (Fri, 22 Feb 2013)



------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2013-02-22 09:23:33 +01:00
committed by Stefan Seyfried
parent 77c08c4c15
commit 9a48ba0583
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/channellist.cpp
View File

@@ -99,6 +99,8 @@ extern cVideo * videoDecoder;
CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vlist) CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vlist)
{ {
frameBuffer = CFrameBuffer::getInstance(); frameBuffer = CFrameBuffer::getInstance();
x = y = 0;
info_height = 0;
name = pName; name = pName;
selected = 0; selected = 0;
selected_in_new_mode = 0; selected_in_new_mode = 0;
@@ -110,6 +112,7 @@ CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vl
new_zap_mode = 0; new_zap_mode = 0;
selected_chid = 0; selected_chid = 0;
footerHeight = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()+6; //initial height value for buttonbar footerHeight = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()+6; //initial height value for buttonbar
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;
//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);
@@ -521,7 +524,10 @@ void CChannelList::calcSize()
listmaxshow = (height - theight - footerHeight -0)/fheight; listmaxshow = (height - theight - footerHeight -0)/fheight;
height = theight + footerHeight + listmaxshow * fheight; height = theight + footerHeight + listmaxshow * fheight;
info_height = 2*fheight + g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_DESCR]->getHeight() + 10; info_height = 2*fheight + g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_DESCR]->getHeight() + 10;
y += (frameBuffer->getScreenHeight() - height - info_height) / 2;
int sh = frameBuffer->getScreenHeight();
int ytmp = (sh - height - info_height) / 2;
y += ytmp;
infozone_width = full_width - width; infozone_width = full_width - width;
pig_width = infozone_width; pig_width = infozone_width;
@@ -1630,10 +1636,10 @@ void CChannelList::paintDetails(int index)
void CChannelList::clearItem2DetailsLine() void CChannelList::clearItem2DetailsLine()
{ {
paintItem2DetailsLine (-1, 0); paintItem2DetailsLine (-1);
} }
void CChannelList::paintItem2DetailsLine (int pos, int /*ch_index*/) void CChannelList::paintItem2DetailsLine (int pos)
{ {
int xpos = x - ConnectLineBox_Width; int xpos = x - ConnectLineBox_Width;
int ypos1 = y + theight+0 + pos*fheight; int ypos1 = y + theight+0 + pos*fheight;
@@ -1797,7 +1803,7 @@ void CChannelList::paintItem(int pos)
if (curr == selected) { if (curr == selected) {
color = COL_MENUCONTENTSELECTED; color = COL_MENUCONTENTSELECTED;
bgcolor = COL_MENUCONTENTSELECTED_PLUS_0; bgcolor = COL_MENUCONTENTSELECTED_PLUS_0;
paintItem2DetailsLine (pos, curr); paintItem2DetailsLine (pos);
paintDetails(curr); paintDetails(curr);
frameBuffer->paintBoxRel(x,ypos, width- 15, fheight, bgcolor, RADIUS_LARGE); frameBuffer->paintBoxRel(x,ypos, width- 15, fheight, bgcolor, RADIUS_LARGE);
paintbuttons = true; paintbuttons = true;

2
src/gui/channellist.h
View File

@@ -98,7 +98,7 @@ private:
void paintDetails(int index); void paintDetails(int index);
void clearItem2DetailsLine (); void clearItem2DetailsLine ();
void paintItem2DetailsLine (int pos, int ch_index); void paintItem2DetailsLine (int pos);
void paintItem(int pos); void paintItem(int pos);
bool updateSelection(int newpos); bool updateSelection(int newpos);
void paint(); void paint();