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

fix scroll bugs

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@151 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7066af3770
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-01-06 (Wed, 06 Jan 2010)



------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2010-01-06 05:54:32 +00:00
parent c444a7d30e
commit 2d16c376b3
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/epgview.cpp
View File

@@ -665,7 +665,7 @@ int CEpgData::show(const t_channel_id channel_id, unsigned long long a_id, time_
{ {
case NeutrinoMessages::EVT_TIMER: case NeutrinoMessages::EVT_TIMER:
if (data == g_InfoViewer->lcdUpdateTimer) { if (data == g_InfoViewer->lcdUpdateTimer) {
GetEPGData(channel_id, id, &startzeit ); GetEPGData(channel_id, id, &startzeit, false);
if ( epg_done!= -1 ) { if ( epg_done!= -1 ) {
CProgressBar pb(pb_blink, -1, -1, 30, 100, 70, true); CProgressBar pb(pb_blink, -1, -1, 30, 100, 70, true);
int pbx = sx + 10 + widthl + 10 + ((ox-104-widthr-widthl-10-10-20)>>1); int pbx = sx + 10 + widthl + 10 + ((ox-104-widthr-widthl-10-10-20)>>1);
@@ -812,6 +812,7 @@ int CEpgData::show(const t_channel_id channel_id, unsigned long long a_id, time_
frameBuffer->paintBackgroundBox (sx, sy- toph, sx+ ox, sy+ oy); frameBuffer->paintBackgroundBox (sx, sy- toph, sx+ ox, sy+ oy);
showTimerEventBar (false); showTimerEventBar (false);
start(); start();
textypos = sy;
//printf("bigFonts %d\n", bigFonts); //printf("bigFonts %d\n", bigFonts);
if (bigFonts) if (bigFonts)
{ {
@@ -872,9 +873,10 @@ void CEpgData::hide()
bool sectionsd_getEPGid(const event_id_t epgID, const time_t startzeit, CEPGData * epgdata); bool sectionsd_getEPGid(const event_id_t epgID, const time_t startzeit, CEPGData * epgdata);
bool sectionsd_getActualEPGServiceKey(const t_channel_id uniqueServiceKey, CEPGData * epgdata); bool sectionsd_getActualEPGServiceKey(const t_channel_id uniqueServiceKey, CEPGData * epgdata);
void CEpgData::GetEPGData(const t_channel_id channel_id, unsigned long long id, time_t* startzeit ) void CEpgData::GetEPGData(const t_channel_id channel_id, unsigned long long id, time_t* startzeit, bool clear )
{ {
epgText.clear(); if(clear)
epgText.clear();
emptyLineCount = 0; emptyLineCount = 0;
epgData.title.clear(); epgData.title.clear();

2
src/gui/epgview.h
View File

@@ -76,7 +76,7 @@ class CEpgData
int botheight,botboxheight; int botheight,botboxheight;
int medlineheight,medlinecount; int medlineheight,medlinecount;
void GetEPGData(const t_channel_id channel_id, unsigned long long id, time_t* startzeit ); void GetEPGData(const t_channel_id channel_id, unsigned long long id, time_t* startzeit, bool clear = true );
void GetPrevNextEPGData( unsigned long long id, time_t* startzeit ); void GetPrevNextEPGData( unsigned long long id, time_t* startzeit );
void addTextToArray( const std::string & text ); void addTextToArray( const std::string & text );
void processTextToArray(std::string text); void processTextToArray(std::string text);