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

CInfoViewer: try to fix overlapping current info and curren/next time info

Browse Source 
This effect was heavy to reproduce, but some useres had such effects.

Hold saved background and hide() ensure clean
background before repaint title and rest.
This commit is contained in:
Thilo Graf
2016-01-03 14:29:20 +01:00
parent ab29b2fa43
commit ec701e3108
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui/infoviewer.cpp
View File

@@ -1624,7 +1624,13 @@ void CInfoViewer::display_Info(const char *current, const char *next,
else else
txt_cur_event->setDimensionsAll(xStart, CurrInfoY - height, currTimeX - xStart - 5, height); txt_cur_event->setDimensionsAll(xStart, CurrInfoY - height, currTimeX - xStart - 5, height);
txt_cur_event->setText(current, CTextBox::NO_AUTO_LINEBREAK, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO], colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_INFOBAR_TEXT); txt_cur_event->setText(current, CTextBox::NO_AUTO_LINEBREAK, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO], colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_INFOBAR_TEXT);
txt_cur_event->paint(CC_SAVE_SCREEN_NO);
if (txt_cur_event_rest && txt_cur_event_rest->isPainted())
txt_cur_event_rest->hide();
if (txt_cur_event && txt_cur_event->isPainted())
txt_cur_event->hide();
txt_cur_event->paint(CC_SAVE_SCREEN_YES);
if (runningStart){ if (runningStart){
if (txt_cur_start == NULL) if (txt_cur_start == NULL)
txt_cur_start = new CComponentsTextTransp(NULL, InfoX, CurrInfoY - height, info_time_width, height); txt_cur_start = new CComponentsTextTransp(NULL, InfoX, CurrInfoY - height, info_time_width, height);
@@ -1640,7 +1646,7 @@ void CInfoViewer::display_Info(const char *current, const char *next,
else else
txt_cur_event_rest->setDimensionsAll(currTimeX, CurrInfoY - height, currTimeW, height); txt_cur_event_rest->setDimensionsAll(currTimeX, CurrInfoY - height, currTimeW, height);
txt_cur_event_rest->setText(runningRest, CTextBox::RIGHT, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO], colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_INFOBAR_TEXT); txt_cur_event_rest->setText(runningRest, CTextBox::RIGHT, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO], colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_INFOBAR_TEXT);
txt_cur_event_rest->paint(CC_SAVE_SCREEN_NO); txt_cur_event_rest->paint(CC_SAVE_SCREEN_YES);
} }
} }
@@ -1981,18 +1987,18 @@ void CInfoViewer::killTitle()
sigbox->kill(); sigbox->kill();
#endif #endif
header->kill(); header->kill();
#if 0 //not really required to kill clock, body does this #if 0 //not really required to kill clock, header does this
if (clock) if (clock)
clock->kill(); clock->kill();
#endif #endif
body->kill(); body->kill();
#if 0 //not really required to kill epg infos, body does this
if (txt_cur_start)
txt_cur_start->kill();
if (txt_cur_event) if (txt_cur_event)
txt_cur_event->kill(); txt_cur_event->kill();
if (txt_cur_event_rest) if (txt_cur_event_rest)
txt_cur_event_rest->kill(); txt_cur_event_rest->kill();
#if 0 //not really required to kill epg infos, body does this
if (txt_cur_start)
txt_cur_start->kill();
if (txt_next_start) if (txt_next_start)
txt_next_start->kill(); txt_next_start->kill();
if (txt_next_event) if (txt_next_event)