From 2d16c376b33f7a0bd13d7831a8d110378eb51424 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Wed, 6 Jan 2010 05:54:32 +0000 Subject: [PATCH] fix scroll bugs 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: https://github.com/neutrino-images/ni-neutrino/commit/7066af37709d8d070429194e408875bd0a7e6447 Author: Jacek Jendrzej Date: 2010-01-06 (Wed, 06 Jan 2010) ------------------ This commit was generated by Migit --- src/gui/epgview.cpp | 8 +++++--- src/gui/epgview.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index a870d335b..158d0b0d7 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -665,7 +665,7 @@ int CEpgData::show(const t_channel_id channel_id, unsigned long long a_id, time_ { case NeutrinoMessages::EVT_TIMER: if (data == g_InfoViewer->lcdUpdateTimer) { - GetEPGData(channel_id, id, &startzeit ); + GetEPGData(channel_id, id, &startzeit, false); if ( epg_done!= -1 ) { CProgressBar pb(pb_blink, -1, -1, 30, 100, 70, true); 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); showTimerEventBar (false); start(); + textypos = sy; //printf("bigFonts %d\n", 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_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; epgData.title.clear(); diff --git a/src/gui/epgview.h b/src/gui/epgview.h index f2b9ba2ca..0b9060952 100644 --- a/src/gui/epgview.h +++ b/src/gui/epgview.h @@ -76,7 +76,7 @@ class CEpgData int botheight,botboxheight; 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 addTextToArray( const std::string & text ); void processTextToArray(std::string text);